ACPI, PNP: hook ACPI D-state to PNP suspend/resume

applied after Rafel's 'PM: Update global suspend and hibernation operations framework' patch set

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index e161423b4300..1432806451cd 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -167,6 +167,8 @@ static int pnp_bus_suspend(struct device *dev, pm_message_t state)
                         return error;
         }
 
+        if (pnp_dev->protocol && pnp_dev->protocol->suspend)
+                pnp_dev->protocol->suspend(pnp_dev, state);
         return 0;
 }
 
@@ -179,6 +181,9 @@ static int pnp_bus_resume(struct device *dev)
         if (!pnp_drv)
                 return 0;
 
+        if (pnp_dev->protocol && pnp_dev->protocol->resume)
+                pnp_dev->protocol->resume(pnp_dev);
+
         if (!(pnp_drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE)) {
                 error = pnp_start_dev(pnp_dev);
                 if (error)