[PATCH] PM / Suspend: Fix bug in suspend statistics update

[PATCH] PM / Suspend: Fix bug in suspend statistics update

[Srivatsa S. Bhat]

A pair of missing braces inside the state_store() function causes even
invalid arguments to suspend to be wrongly treated as failed suspend
attempts. Fix this.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
---

 kernel/power/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 71f49fe..36e0f09 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -290,13 +290,14 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
 		if (*s && len == strlen(*s) && !strncmp(buf, *s, len))
 			break;
 	}
-	if (state < PM_SUSPEND_MAX && *s)
+	if (state < PM_SUSPEND_MAX && *s) {
 		error = enter_state(state);
 		if (error) {
 			suspend_stats.fail++;
 			dpm_save_failed_errno(error);
 		} else
 			suspend_stats.success++;
+	}
 #endif
 
  Exit:

Re: [PATCH] PM / Suspend: Fix bug in suspend statistics update

[Rafael J. Wysocki]

On Saturday, November 19, 2011, Srivatsa S. Bhat wrote:
> A pair of missing braces inside the state_store() function causes even
> invalid arguments to suspend to be wrongly treated as failed suspend
> attempts. Fix this.
> 
> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

Good catch!  Applied to linux-pm/pm-fixes.

Thanks,
Rafael


> ---
> 
>  kernel/power/main.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/kernel/power/main.c b/kernel/power/main.c
> index 71f49fe..36e0f09 100644
> --- a/kernel/power/main.c
> +++ b/kernel/power/main.c
> @@ -290,13 +290,14 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
>  		if (*s && len == strlen(*s) && !strncmp(buf, *s, len))
>  			break;
>  	}
> -	if (state < PM_SUSPEND_MAX && *s)
> +	if (state < PM_SUSPEND_MAX && *s) {
>  		error = enter_state(state);
>  		if (error) {
>  			suspend_stats.fail++;
>  			dpm_save_failed_errno(error);
>  		} else
>  			suspend_stats.success++;
> +	}
>  #endif
>  
>   Exit:
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 

Re: [PATCH] PM / Suspend: Fix bug in suspend statistics update

[Pavel Machek]

On Sat 2011-11-19 14:50:26, Srivatsa S. Bhat wrote:
> A pair of missing braces inside the state_store() function causes even
> invalid arguments to suspend to be wrongly treated as failed suspend
> attempts. Fix this.
> 
> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

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