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

Commit 86460103 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM: check sysdev_suspend(PMSG_FREEZE) return value
parents b83674c0 4484079d

kernel/power/disk.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -241,9 +241,9 @@ static int create_image(int platform_mode) 




	local_irq_disable();

	local_irq_disable();





	sysdev_suspend(PMSG_FREEZE);

	error = sysdev_suspend(PMSG_FREEZE);

	if (error) {

	if (error) {

		printk(KERN_ERR "PM: Some devices failed to power down, "

		printk(KERN_ERR "PM: Some system devices failed to power down, "

			"aborting hibernation\n");

			"aborting hibernation\n");

		goto Enable_irqs;

		goto Enable_irqs;

	}

	}