Commit 2f47a9a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents ca0ea8a6 544e737d

drivers/base/power/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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);