Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux

1 files changed, 1 insertions, 6 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index f99ed6a75eac..868028280d13 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -289,12 +289,10 @@ static int suspend_enter(suspend_state_t state)
 {
         int error;
 
-        device_pm_lock();
-
         if (suspend_ops->prepare) {
                 error = suspend_ops->prepare();
                 if (error)
-                        goto Done;
+                        return error;
         }
 
         error = device_power_down(PMSG_SUSPEND);
@@ -343,9 +341,6 @@ static int suspend_enter(suspend_state_t state)
         if (suspend_ops->finish)
                 suspend_ops->finish();
 
- Done:
-        device_pm_unlock();
-
         return error;
 }