Merge branch 'merge'

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 6889e7db3aff..a082a2e34252 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -1141,6 +1141,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
                 put_device(dev);
                 clear_bit(chip->dev_num, dev_mask);
                 kfree(chip);
+                kfree(devname);
                 return NULL;
         }