PM: sleep: Fix error handling in dpm_prepare()

Commit e1825cbd7e63 ("PM: sleep: Avoid calling put_device() under
dpm_list_mtx") forgot to update the while () loop termination
condition to also break the loop if error is nonzero, which
causes the loop to become infinite if device_prepare() returns
an error for one device.

Add the missing !error check.

Fixes: e1825cbd7e63 ("PM: sleep: Avoid calling put_device() under dpm_list_mtx")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reported-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Cc: All applicable <stable@vger.kernel.org>

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index f4d0c555de29b40b708cf1f80be19d8f4d832148..04ea92cbd9cfd47dcb1b72aa0d2cce52a63e5bc4 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1902,7 +1902,7 @@ int dpm_prepare(pm_message_t state)
        device_block_probing();
 
        mutex_lock(&dpm_list_mtx);
-       while (!list_empty(&dpm_list)) {
+       while (!list_empty(&dpm_list) && !error) {
                struct device *dev = to_device(dpm_list.next);
 
                get_device(dev);