summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/pm
diff options
context:
space:
mode:
authorJohan Rudholm <johan.rudholm@stericsson.com>2011-10-18 15:03:40 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:13 +0200
commitaab4c11dcea3cbb3b9d38fdd4391c18869933e3b (patch)
treec2d3a0267e201596a9b2e22bbc391e5d1973b5a2 /arch/arm/mach-ux500/pm
parent6318d3ee7a93e4a490034931a10d0fa3e1782658 (diff)
ARM: ux500: pm: Check proper return values
A return value from schedule_delayed_work not equal to zero does not mean failure, but the code in performance_register assumed so. ST-Ericsson ID: 357764 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: Ib8c822fdef98d721d37dcbb2fad278b7b3559610 Signed-off-by: Johan Rudholm <johan.rudholm@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34377 Reviewed-by: QATOOLS Reviewed-by: Per FORLIN <per.forlin@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/pm')
-rw-r--r--arch/arm/mach-ux500/pm/performance.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm/mach-ux500/pm/performance.c b/arch/arm/mach-ux500/pm/performance.c
index b09840274a0..04aca3cb5bd 100644
--- a/arch/arm/mach-ux500/pm/performance.c
+++ b/arch/arm/mach-ux500/pm/performance.c
@@ -195,30 +195,29 @@ static int __init performance_register(void)
int ret;
#ifdef CONFIG_MMC_BLOCK
- prcmu_qos_add_requirement(PRCMU_QOS_ARM_OPP, "mmc", 25);
+ ret = prcmu_qos_add_requirement(PRCMU_QOS_ARM_OPP, "mmc", 25);
+ if (ret) {
+ pr_err("%s: Failed to add PRCMU req for mmc\n", __func__);
+ goto out;
+ }
INIT_DELAYED_WORK_DEFERRABLE(&work_mmc, mmc_load);
- ret = schedule_delayed_work(&work_mmc,
+ schedule_delayed_work(&work_mmc,
msecs_to_jiffies(PERF_MMC_PROBE_DELAY));
+#endif
+
+ ret = prcmu_qos_add_requirement(PRCMU_QOS_ARM_OPP, "wlan", 25);
if (ret) {
- pr_err("ux500: performance: Fail to schedudle mmc work\n");
+ pr_err("%s: Failed to add PRCMU req for wlan\n", __func__);
goto out;
}
-#endif
-
- prcmu_qos_add_requirement(PRCMU_QOS_ARM_OPP, "wlan", 25);
INIT_DELAYED_WORK_DEFERRABLE(&work_wlan_workaround,
wlan_load);
- ret = schedule_delayed_work_on(0,
- &work_wlan_workaround,
- msecs_to_jiffies(WLAN_PROBE_DELAY));
- if (ret) {
- pr_err("ux500: performance: Fail to schedudle wlan work\n");
- goto out;
- }
+ schedule_delayed_work_on(0, &work_wlan_workaround,
+ msecs_to_jiffies(WLAN_PROBE_DELAY));
out:
return ret;
}