From: Roel Kluin Date: Wed, 16 Dec 2009 16:22:04 +0000 (+0100) Subject: OMAP: omap3_pm_get_suspend_state() error ignored in pwrdm_suspend_get() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=61b17d972f60fb8097592cadee2a2dd594285ff6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: Kevin Hilman --- diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index e9d3993d1f96..562d190cd66c 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; }