diff options
| author | Zhao Chenhui <chenhui.zhao@freescale.com> | 2013-05-09 10:57:31 (GMT) |
|---|---|---|
| committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-05-13 22:19:00 (GMT) |
| commit | a0abc77826c9af394baf35c1b7d636aacc2077f8 (patch) | |
| tree | 0cb1d6c14a3db2b02303520ef25444c1ac817ad0 /arch/powerpc/sysdev/fsl_pmc.c | |
| parent | ee8809b1b132fd388aac03ef7a93a9acb2361240 (diff) | |
| download | linux-fsl-qoriq-a0abc77826c9af394baf35c1b7d636aacc2077f8.tar.xz | |
powerpc/pm: fix the return value of .enter()
Change-Id: If7505a718c9a76b26eb8ea80c82bb0f4d2742192
Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/2456
Reviewed-by: Wood Scott-B07421 <scottwood@freescale.com>
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pmc.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pmc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/fsl_pmc.c b/arch/powerpc/sysdev/fsl_pmc.c index 88581c0..61dba33 100644 --- a/arch/powerpc/sysdev/fsl_pmc.c +++ b/arch/powerpc/sysdev/fsl_pmc.c @@ -117,6 +117,7 @@ EXPORT_SYMBOL_GPL(mpc85xx_pmc_set_lossless_ethernet); static int pmc_suspend_enter(suspend_state_t state) { int ret = 0; + int result; switch (state) { #ifdef CONFIG_PPC_85xx @@ -143,13 +144,13 @@ static int pmc_suspend_enter(suspend_state_t state) /* At this point, the CPU is asleep. */ /* Upon resume, wait for SLP bit to be clear. */ - ret = spin_event_timeout( + result = spin_event_timeout( (in_be32(&pmc_regs->powmgtcsr) & POWMGTCSR_SLP) == 0, 10000, 10); - if (!ret) { + if (!result) { pr_err("%s: timeout waiting for SLP bit " "to be cleared\n", __func__); - ret = -EINVAL; + ret = -ETIMEDOUT; } break; |