[PATCH] PM: check sysdev_suspend(PMSG_FREEZE) return value

[PATCH] PM: check sysdev_suspend(PMSG_FREEZE) return value

[Bjorn Helgaas]

Check the return value of sysdev_suspend().  I think this was a typo.
Without this change, the following "if" check is always false.
I also changed the error message so it's distinguishable from the
similar message a few lines above.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
 kernel/power/disk.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 2616832..6674722 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -242,9 +242,9 @@ static int create_image(int platform_mode)
 
 	local_irq_disable();
 
-	sysdev_suspend(PMSG_FREEZE);
+	error = sysdev_suspend(PMSG_FREEZE);
 	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");
 		goto Enable_irqs;
 	}

Re: [PATCH] PM: check sysdev_suspend(PMSG_FREEZE) return value

[Pavel Machek]

On Fri 2009-05-15 05:33:49, Bjorn Helgaas wrote:
> Check the return value of sysdev_suspend().  I think this was a typo.
> Without this change, the following "if" check is always false.
> I also changed the error message so it's distinguishable from the
> similar message a few lines above.
> 
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

Acked-by: Pavel Machek <pavel@ucw.cz>

> ---
>  kernel/power/disk.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/power/disk.c b/kernel/power/disk.c
> index 2616832..6674722 100644
> --- a/kernel/power/disk.c
> +++ b/kernel/power/disk.c
> @@ -242,9 +242,9 @@ static int create_image(int platform_mode)
>  
>  	local_irq_disable();
>  
> -	sysdev_suspend(PMSG_FREEZE);
> +	error = sysdev_suspend(PMSG_FREEZE);
>  	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");
>  		goto Enable_irqs;
>  	}

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH] PM: check sysdev_suspend(PMSG_FREEZE) return value

[Rafael J. Wysocki]

On Friday 15 May 2009, Bjorn Helgaas wrote:
> Check the return value of sysdev_suspend().  I think this was a typo.

Yes, it was, good catch!

I'm going to push that to Linus for .30.

> Without this change, the following "if" check is always false.
> I also changed the error message so it's distinguishable from the
> similar message a few lines above.

Thanks,
Rafael

 
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
> ---
>  kernel/power/disk.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/power/disk.c b/kernel/power/disk.c
> index 2616832..6674722 100644
> --- a/kernel/power/disk.c
> +++ b/kernel/power/disk.c
> @@ -242,9 +242,9 @@ static int create_image(int platform_mode)
>  
>  	local_irq_disable();
>  
> -	sysdev_suspend(PMSG_FREEZE);
> +	error = sysdev_suspend(PMSG_FREEZE);
>  	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");
>  		goto Enable_irqs;
>  	}
>