2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 26468971ef5a..bdd96b03b885 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -22,6 +22,9 @@ extern int sysdev_resume(void);
 
 int resume_device(struct device * dev)
 {
+        int error = 0;
+
+        down(&dev->sem);
         if (dev->power.pm_parent
                         && dev->power.pm_parent->power.power_state) {
                 dev_err(dev, "PM: resume from %d, parent %s still %d\n",
@@ -31,9 +34,10 @@ int resume_device(struct device * dev)
         }
         if (dev->bus && dev->bus->resume) {
                 dev_dbg(dev,"resuming\n");
-                return dev->bus->resume(dev);
+                error = dev->bus->resume(dev);
         }
-        return 0;
+        up(&dev->sem);
+        return error;
 }
 
 
diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 0ec44ef840be..807e13fb205b 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -39,6 +39,7 @@ int suspend_device(struct device * dev, pm_message_t state)
 {
         int error = 0;
 
+        down(&dev->sem);
         if (dev->power.power_state) {
                 dev_dbg(dev, "PM: suspend %d-->%d\n",
                         dev->power.power_state, state);
@@ -58,7 +59,7 @@ int suspend_device(struct device * dev, pm_message_t state)
                 dev_dbg(dev, "suspending\n");
                 error = dev->bus->suspend(dev, state);
         }
-
+        up(&dev->sem);
         return error;
 }