X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=blobdiff_plain;f=drivers%2Fbase%2Fpower%2Fmain.c;h=cbea78e79f3dfae2e6a6a603c60b582cb549131b;hp=d568772152c2d5cc93b81cf370337d5cf40beba9;hb=be2d24336f8876d60d8a4634f1a1e4753c4be124;hpb=20192d9c9f6ae447c461285c915502ffbddf5696

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index d568772152c2..cbea78e79f3d 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1642,7 +1642,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 	}
 
 	dev->power.may_skip_resume = true;
-	dev->power.must_resume = false;
+	dev->power.must_resume = !dev_pm_test_driver_flags(dev, DPM_FLAG_MAY_SKIP_RESUME);
 
 	dpm_watchdog_set(&wd, dev);
 	device_lock(dev);