| Message ID | 1477520926-32594-2-git-send-email-jgunthorpe@obsidianresearch.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Oct 26, 2016 at 04:28:45PM -0600, Jason Gunthorpe wrote: > tpm_chip_unregister can only be called after tpm_chip_register. > devm manages the allocation so no unwind is needed here. > > Fixes: afb5abc262e96 ("tpm: two-phase chip management functions") Cc: stable@vger.kernel.org Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> /Jarkko > --- > drivers/char/tpm/xen-tpmfront.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c > index 62028f483bba..a2ab00831df1 100644 > --- a/drivers/char/tpm/xen-tpmfront.c > +++ b/drivers/char/tpm/xen-tpmfront.c > @@ -307,7 +307,6 @@ static int tpmfront_probe(struct xenbus_device *dev, > rv = setup_ring(dev, priv); > if (rv) { > chip = dev_get_drvdata(&dev->dev); > - tpm_chip_unregister(chip); > ring_free(priv); > return rv; > } > -- > 2.1.4 > ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi
On Wed, Nov 02, 2016 at 04:30:30AM -0600, Jarkko Sakkinen wrote: > On Wed, Oct 26, 2016 at 04:28:45PM -0600, Jason Gunthorpe wrote: > > tpm_chip_unregister can only be called after tpm_chip_register. > > devm manages the allocation so no unwind is needed here. > > > > Fixes: afb5abc262e96 ("tpm: two-phase chip management functions") > > Cc: stable@vger.kernel.org > Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> > > /Jarkko Applied. /Jarkko > > > --- > > drivers/char/tpm/xen-tpmfront.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c > > index 62028f483bba..a2ab00831df1 100644 > > --- a/drivers/char/tpm/xen-tpmfront.c > > +++ b/drivers/char/tpm/xen-tpmfront.c > > @@ -307,7 +307,6 @@ static int tpmfront_probe(struct xenbus_device *dev, > > rv = setup_ring(dev, priv); > > if (rv) { > > chip = dev_get_drvdata(&dev->dev); > > - tpm_chip_unregister(chip); > > ring_free(priv); > > return rv; > > } > > -- > > 2.1.4 > > > > ------------------------------------------------------------------------------ > Developer Access Program for Intel Xeon Phi Processors > Access to Intel Xeon Phi processor-based developer platforms. > With one year of Intel Parallel Studio XE. > Training and support from Colfax. > Order your platform today. http://sdm.link/xeonphi > _______________________________________________ > tpmdd-devel mailing list > tpmdd-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/tpmdd-devel ------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today. http://sdm.link/xeonphi
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c index 62028f483bba..a2ab00831df1 100644 --- a/drivers/char/tpm/xen-tpmfront.c +++ b/drivers/char/tpm/xen-tpmfront.c @@ -307,7 +307,6 @@ static int tpmfront_probe(struct xenbus_device *dev, rv = setup_ring(dev, priv); if (rv) { chip = dev_get_drvdata(&dev->dev); - tpm_chip_unregister(chip); ring_free(priv); return rv; }
tpm_chip_unregister can only be called after tpm_chip_register. devm manages the allocation so no unwind is needed here. Fixes: afb5abc262e96 ("tpm: two-phase chip management functions") --- drivers/char/tpm/xen-tpmfront.c | 1 - 1 file changed, 1 deletion(-)