Skip to content

Commit 2f47a9a

Browse files
committed
Merge tag 'pm-5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki: "Fix a recent regression causing the loop in dpm_prepare() to become infinite if one of the device ->prepare() callbacks returns an error" * tag 'pm-5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM: sleep: Fix error handling in dpm_prepare()
2 parents ca0ea8a + 544e737 commit 2f47a9a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/base/power/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1902,7 +1902,7 @@ int dpm_prepare(pm_message_t state)
19021902
device_block_probing();
19031903

19041904
mutex_lock(&dpm_list_mtx);
1905-
while (!list_empty(&dpm_list)) {
1905+
while (!list_empty(&dpm_list) && !error) {
19061906
struct device *dev = to_device(dpm_list.next);
19071907

19081908
get_device(dev);

0 commit comments

Comments
 (0)