Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42b16c05 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Greg Kroah-Hartman
Browse files

[PATCH] Driver core: Don't "lose" devices on suspend on failure 



I think we need this patch or we might "lose" devices to the dpm_irq_off
list if a failure occurs during the suspend process.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8215534c

drivers/base/power/suspend.c

+12 −1
Original line number Diff line number Diff line
@@ -114,8 +114,19 @@ int device_suspend(pm_message_t state) 
		put_device(dev);

	}

	up(&dpm_list_sem);

	if (error)

	if (error) {

		/* we failed... before resuming, bring back devices from

		 * dpm_off_irq list back to main dpm_off list, we do want

		 * to call resume() on them, in case they partially suspended

		 * despite returning -EAGAIN

		 */

		while (!list_empty(&dpm_off_irq)) {

			struct list_head * entry = dpm_off_irq.next;

			list_del(entry);

			list_add(entry, &dpm_off);

		}

		dpm_resume();

	}

	up(&dpm_sem);

	return error;

}