diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-11-10 00:43:52 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-11-10 00:43:52 +0100 |
| commit | be2658ffe1d2a4ab4e045b22a317459595abc2c4 (patch) | |
| tree | 7820920de13b918939a42b5fb1c6e80f6ad7461d /arch | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pau... (diff) | |
| download | linux-be2658ffe1d2a4ab4e045b22a317459595abc2c4.tar.xz linux-be2658ffe1d2a4ab4e045b22a317459595abc2c4.zip | |
PM / shmobile: Don't skip debugging output in pd_power_up()
Don't skip debugging output upon earlier loop termination in pd_power_up().
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-sh7372.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c index 79612737c5b2..e26138352f07 100644 --- a/arch/arm/mach-shmobile/pm-sh7372.c +++ b/arch/arm/mach-shmobile/pm-sh7372.c @@ -123,13 +123,13 @@ static int pd_power_up(struct generic_pm_domain *genpd) for (retry_count = 2 * PSTR_RETRIES; retry_count; retry_count--) { if (!(__raw_readl(SWUCR) & mask)) - goto out; + break; if (retry_count > PSTR_RETRIES) udelay(PSTR_DELAY_US); else cpu_relax(); } - if (__raw_readl(SWUCR) & mask) + if (!retry_count) ret = -EIO; if (!sh7372_pd->no_debug) |