patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / base / power / runtime.c

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index d901a6f..4ff5340 100644 (file)
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -12,9 +12,11 @@
 
 static void runtime_resume(struct device * dev)
 {
+       dev_dbg(dev, "resuming\n");
        if (!dev->power.power_state)
                return;
-       resume_device(dev);
+       if (!resume_device(dev))
+               dev->power.power_state = 0;
 }