Merge branch 'tpmdd-fixes-v3.6' of git://github.com/shpedoikal/linux into for-linus

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index f26afdb1a702..b429f1ea1b97 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -1259,6 +1259,7 @@ void tpm_remove_hardware(struct device *dev)
 
         misc_deregister(&chip->vendor.miscdev);
         sysfs_remove_group(&dev->kobj, chip->vendor.attr_group);
+        tpm_remove_ppi(&dev->kobj);
         tpm_bios_log_teardown(chip->bios_dir);
 
         /* write it this way to be explicit (chip->dev == dev) */
@@ -1476,7 +1477,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
                 goto put_device;
         }
 
-        if (sys_add_ppi(&dev->kobj)) {
+        if (tpm_add_ppi(&dev->kobj)) {
                 misc_deregister(&chip->vendor.miscdev);
                 goto put_device;
         }