diff options
author | Stefan Berger <stefanb@linux.vnet.ibm.com> | 2014-06-19 15:00:19 -0400 |
---|---|---|
committer | Peter Huewe <peterhuewe@gmx.de> | 2014-07-29 17:10:55 -0400 |
commit | b49e1043c48dac23f64fba684d31c4a96c1ffaa0 (patch) | |
tree | 6b6e91287796c992300d6b328df1b29084b27896 /drivers/char | |
parent | f07a5e9a331045e976a3d317ba43d14859d9407c (diff) |
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>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/tpm/tpm-interface.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 62e10fd1e1cb..d175fb8e719a 100644 --- 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, | |||
1095 | goto del_misc; | 1095 | goto del_misc; |
1096 | 1096 | ||
1097 | if (tpm_add_ppi(&dev->kobj)) | 1097 | if (tpm_add_ppi(&dev->kobj)) |
1098 | goto del_misc; | 1098 | goto del_sysfs; |
1099 | 1099 | ||
1100 | chip->bios_dir = tpm_bios_log_setup(chip->devname); | 1100 | chip->bios_dir = tpm_bios_log_setup(chip->devname); |
1101 | 1101 | ||
@@ -1106,6 +1106,8 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, | |||
1106 | 1106 | ||
1107 | return chip; | 1107 | return chip; |
1108 | 1108 | ||
1109 | del_sysfs: | ||
1110 | tpm_sysfs_del_device(chip); | ||
1109 | del_misc: | 1111 | del_misc: |
1110 | tpm_dev_del_device(chip); | 1112 | tpm_dev_del_device(chip); |
1111 | put_device: | 1113 | put_device: |