From f22d70e3edeee80aa2330266c613e153efd08a8e Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Wed, 16 Dec 2009 17:22:04 +0100 Subject: [PATCH] --- yaml --- r: 179767 b: refs/heads/master c: 61b17d972f60fb8097592cadee2a2dd594285ff6 h: refs/heads/master i: 179765: a6958f158b7c4aca1022e0aa314835f1339d6ec8 179763: 15a50d335a47109cb8fe9af5c3465bb4b6a33730 179759: 0a9103f840b0cab7ddea78fbfc8009b502feaec0 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/pm-debug.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ce261a57f953..d0179263e3a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3d9329640e4b291cdd2c6d178774c28bba47d59 +refs/heads/master: 61b17d972f60fb8097592cadee2a2dd594285ff6 diff --git a/trunk/arch/arm/mach-omap2/pm-debug.c b/trunk/arch/arm/mach-omap2/pm-debug.c index e9d3993d1f96..562d190cd66c 100644 --- a/trunk/arch/arm/mach-omap2/pm-debug.c +++ b/trunk/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; }