tpm: Properly clean sysfs entries in error path

Properly clean the sysfs entries in the error path

Cc: <stable@vger.kernel.org>
Reported-by: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 62e10fd1e1cbe2543043d42b1e3e7650160c89ba..d175fb8e719aa2c6e9d007013410a7c5cdbfde31 100644 (file)
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -1095,7 +1095,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
                goto del_misc;
 
        if (tpm_add_ppi(&dev->kobj))
-               goto del_misc;
+               goto del_sysfs;
 
        chip->bios_dir = tpm_bios_log_setup(chip->devname);
 
@@ -1106,6 +1106,8 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
 
        return chip;
 
+del_sysfs:
+       tpm_sysfs_del_device(chip);
 del_misc:
        tpm_dev_del_device(chip);
 put_device: