Suspend-related patches for 2.6.27

[linux-2.6-omap-h63xx.git] / drivers / base / power / main.c

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index d571204aaff788aa28c0a4275aa6a6fe0514a6e2..3250c5257b748286cfec992558a7590f0ab915e9 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -781,8 +781,6 @@ int device_suspend(pm_message_t state)
        error = dpm_prepare(state);
        if (!error)
                error = dpm_suspend(state);
-       if (error)
-               device_resume(resume_event(state));
        return error;
 }
 EXPORT_SYMBOL_GPL(device_suspend);