diff options
| author | Gang Wei <gang.wei@intel.com> | 2012-10-09 17:35:22 +0800 |
|---|---|---|
| committer | Kent Yoder <key@linux.vnet.ibm.com> | 2012-10-10 09:50:56 -0500 |
| commit | 1631cfb7cee28388b04aef6c0a73050f6fd76e4d (patch) | |
| tree | c3c5d069dedb5c1084a18ddb3be06c6e9a6aa9de /drivers/char/tpm/tpm.c | |
| parent | ecefbd94b834fa32559d854646d777c56749ef1c (diff) | |
| download | linux-1631cfb7cee28388b04aef6c0a73050f6fd76e4d.tar.gz linux-1631cfb7cee28388b04aef6c0a73050f6fd76e4d.tar.bz2 linux-1631cfb7cee28388b04aef6c0a73050f6fd76e4d.zip | |
driver/char/tpm: fix regression causesd by ppi
This patch try to fix the S3 regression https://lkml.org/lkml/2012/10/5/433,
which includes below line:
[ 1554.684638] sysfs: cannot create duplicate filename '/devices/pnp0/00:0c/ppi'
The root cause is that ppi sysfs teardown code is MIA, so while S3 resume,
the ppi kobject will be created again upon existing one.
To make the tear down code simple, change the ppi subfolder creation from
using kobject_create_and_add to just using a named ppi attribute_group. Then
ppi sysfs teardown could be done with a simple sysfs_remove_group call.
Adjusted the name & return type for ppi sysfs init function.
Reported-by: Ben Guthro <ben@guthro.net>
Signed-off-by: Gang Wei <gang.wei@intel.com>
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Diffstat (limited to 'drivers/char/tpm/tpm.c')
| -rw-r--r-- | drivers/char/tpm/tpm.c | 3 |
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; } |