PM / shmobile: Don't skip debugging output in pd_power_up()
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Wed, 9 Nov 2011 23:43:52 +0000 (00:43 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 9 Nov 2011 23:43:52 +0000 (00:43 +0100)
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>
arch/arm/mach-shmobile/pm-sh7372.c

index 79612737c5b231867b06d809b5c54ec5d92aadf7..e26138352f07ae8e43b0059d89565e6aec3dc146 100644 (file)
@@ -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)