diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-09 12:01:35 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-09 12:01:35 +0800 |
| commit | 19192a140ad72b5bd0d57620bfe236bc03561bb6 (patch) | |
| tree | dc8289d075edcb1c23add72c425494a1e05e6f86 /drivers/char | |
| parent | 282b308ad3b60ef0a55ff8b1ef6f16dadcede935 (diff) | |
| parent | eaa88578f2135fa8548d5f127259904a1b3f44c0 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/xen-tpmfront.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c index 3111f2778079..849f2e29c243 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; } |