From: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Date: Wed, 26 Oct 2016 22:28:45 +0000 (-0600)
Subject: tpm xen: Remove bogus tpm_chip_unregister
X-Git-Tag: v4.1.38~55
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=315419538d84b1f28f0805cd278a1ae748f7a5b2;p=thirdparty%2Fkernel%2Fstable.git

tpm xen: Remove bogus tpm_chip_unregister

[ Upstream commit 1f0f30e404b3d8f4597a2d9b77fba55452f8fd0e ]

tpm_chip_unregister can only be called after tpm_chip_register.
devm manages the allocation so no unwind is needed here.

Cc: stable@vger.kernel.org
Fixes: afb5abc262e96 ("tpm: two-phase chip management functions")
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---

diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 3111f2778079d..849f2e29c2436 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -305,7 +305,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;
 	}