Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-bionic-kernel.git] / drivers / char / tpm / xen-tpmfront.c

diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 5aaa268f3a784a8aa0eb8a2889deeef6d071cccb..656e8af95d5282f8dbce5e4bd6e277c368092a81 100644 (file)
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -289,7 +289,6 @@ static int tpmfront_probe(struct xenbus_device *dev,
                const struct xenbus_device_id *id)
 {
        struct tpm_private *priv;
-       struct tpm_chip *chip;
        int rv;
 
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
@@ -306,7 +305,6 @@ static int tpmfront_probe(struct xenbus_device *dev,
 
        rv = setup_ring(dev, priv);
        if (rv) {
-               chip = dev_get_drvdata(&dev->dev);
                ring_free(priv);
                return rv;
        }