1 files changed, 32 insertions, 5 deletions

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index ea2cb9a8b21d..15fb758a9e52 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -150,19 +150,46 @@ static int pnp_bus_suspend(struct device *dev, pm_message_t state)
 {
         struct pnp_dev * pnp_dev = to_pnp_dev(dev);
         struct pnp_driver * pnp_drv = pnp_dev->driver;
+        int error;
+
+        if (!pnp_drv)
+                return 0;
+
+        if (pnp_drv->suspend) {
+                error = pnp_drv->suspend(pnp_dev, state);
+                if (error)
+                        return error;
+        }
+
+        if (!(pnp_drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE) &&
+            pnp_can_disable(pnp_dev)) {
+                error = pnp_stop_dev(pnp_dev);
+                if (error)
+                        return error;
+        }
 
-        if (pnp_drv && pnp_drv->suspend)
-                return pnp_drv->suspend(pnp_dev, state);
         return 0;
 }
 
-static void pnp_bus_resume(struct device *dev)
+static int pnp_bus_resume(struct device *dev)
 {
         struct pnp_dev * pnp_dev = to_pnp_dev(dev);
         struct pnp_driver * pnp_drv = pnp_dev->driver;
+        int error;
+
+        if (!pnp_drv)
+                return 0;
+
+        if (!(pnp_drv->flags & PNP_DRIVER_RES_DO_NOT_CHANGE)) {
+                error = pnp_start_dev(pnp_dev);
+                if (error)
+                        return error;
+        }
 
-        if (pnp_drv && pnp_drv->resume)
-                pnp_drv->resume(pnp_dev);
+        if (pnp_drv->resume)
+                return pnp_drv->resume(pnp_dev);
+
+        return 0;
 }
 
 struct bus_type pnp_bus_type = {