From d5f7d5ed1db4f4614b4cfa736b8597cbbcbde479 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 14 Jul 2011 20:59:35 +0200 Subject: [PATCH] --- yaml --- r: 256952 b: refs/heads/master c: 5ca80817e231723f1399bff495854ba2171103ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/pm-sh7372.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ec248194fdcc..43322f2916c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d28054020f97c7c9f15327a53945f0f40ffc5d7a +refs/heads/master: 5ca80817e231723f1399bff495854ba2171103ca diff --git a/trunk/arch/arm/mach-shmobile/pm-sh7372.c b/trunk/arch/arm/mach-shmobile/pm-sh7372.c index 0b07138908b7..933fb411be0f 100644 --- a/trunk/arch/arm/mach-shmobile/pm-sh7372.c +++ b/trunk/arch/arm/mach-shmobile/pm-sh7372.c @@ -106,7 +106,6 @@ static int pd_power_down_a3rv(struct generic_pm_domain *genpd) int ret = pd_power_down(genpd); /* try to power down A4LC after A3RV is requested off */ - pm_genpd_poweron(&sh7372_a4lc.genpd); genpd_queue_power_off_work(&sh7372_a4lc.genpd); return ret; @@ -118,7 +117,7 @@ static int pd_power_down_a4lc(struct generic_pm_domain *genpd) if (!(__raw_readl(PSTR) & (1 << sh7372_a3rv.bit_shift))) return pd_power_down(genpd); - return 0; + return -EBUSY; } static bool pd_active_wakeup(struct device *dev)