2009-12-16 16:20:21

by Roel Kluin

Subject: [PATCH] OMAP: omap3_pm_get_suspend_state() error ignored in pwrdm_suspend_get()

val is an u64 pointer, we need an int to check the error.

Signed-off-by: Roel Kluin <[email protected]>
---
Found using coccinelle: http://coccinelle.lip6.fr/

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 860b755..081ca85 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -488,9 +488,11 @@ int pm_dbg_regset_init(int reg_set)

static int pwrdm_suspend_get(void *data, u64 *val)
{
- *val = omap3_pm_get_suspend_state((struct powerdomain *)data);
+ int ret;
+ ret = omap3_pm_get_suspend_state((struct powerdomain *)data);
+ *val = ret;

- if (*val >= 0)
+ if (ret >= 0)
return 0;
return *val;
}

2009-12-16 17:24:13

by Kevin Hilman

Subject: Re: [PATCH] OMAP: omap3_pm_get_suspend_state() error ignored in pwrdm_suspend_get()

Roel Kluin <[email protected]> writes:

> val is an u64 pointer, we need an int to check the error.
>
> Signed-off-by: Roel Kluin <[email protected]>

Thanks, will queue this in my PM fixes queue for .33-rc series.

Kevin

> ---
> Found using coccinelle: http://coccinelle.lip6.fr/
>
> diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
> index 860b755..081ca85 100644
> --- a/arch/arm/mach-omap2/pm-debug.c
> +++ b/arch/arm/mach-omap2/pm-debug.c
> @@ -488,9 +488,11 @@ int pm_dbg_regset_init(int reg_set)
>
> static int pwrdm_suspend_get(void *data, u64 *val)
> {
> - *val = omap3_pm_get_suspend_state((struct powerdomain *)data);
> + int ret;
> + ret = omap3_pm_get_suspend_state((struct powerdomain *)data);
> + *val = ret;
>
> - if (*val >= 0)
> + if (ret >= 0)
> return 0;
> return *val;
> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/