The patch titled
tpm_infineon: fix suspend/resume handler for pnp_driver
has been removed from the -mm tree. Its filename was
tpm_infineon-fix-suspend-resume-handler-for-pnp_driver.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: tpm_infineon: fix suspend/resume handler for pnp_driver
From: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
With recent quick review, I found the bug in tpm_infineon. (I don't have
this device, and compile test only)
PNP driver must use pnp_driver->suspend/resume.
Signed-off-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Cc: Debora Velarde <debora@xxxxxxxxxxxxxxxxxx>
Cc: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx>
Cc: Marcel Selhorst <m.selhorst@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/tpm/tpm_infineon.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff -puN drivers/char/tpm/tpm_infineon.c~tpm_infineon-fix-suspend-resume-handler-for-pnp_driver drivers/char/tpm/tpm_infineon.c
--- a/drivers/char/tpm/tpm_infineon.c~tpm_infineon-fix-suspend-resume-handler-for-pnp_driver
+++ a/drivers/char/tpm/tpm_infineon.c
@@ -611,16 +611,26 @@ static __devexit void tpm_inf_pnp_remove
}
}
+static int tpm_pnp_suspend(struct pnp_dev *dev, pm_message_t pm_state)
+{
+ return tpm_pm_suspend(&dev->dev, pm_state);
+}
+
+static int tpm_pnp_resume(struct pnp_dev *dev)
+{
+ return tpm_pm_resume(&dev->dev);
+}
+
static struct pnp_driver tpm_inf_pnp_driver = {
.name = "tpm_inf_pnp",
- .driver = {
- .owner = THIS_MODULE,
- .suspend = tpm_pm_suspend,
- .resume = tpm_pm_resume,
- },
.id_table = tpm_pnp_tbl,
.probe = tpm_inf_pnp_probe,
.remove = __devexit_p(tpm_inf_pnp_remove),
+ .suspend = tpm_pnp_suspend,
+ .resume = tpm_pnp_resume,
+ .driver = {
+ .owner = THIS_MODULE,
+ },
};
static int __init init_inf(void)
_
Patches currently in -mm which might be from hirofumi@xxxxxxxxxxxxxxxxxx are
linux-next.patch
tpm_infineon-fix-suspend-resume-handler-for-pnp_driver.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
