From 6bda59197b24f44efd8848e57e588a16ce1f1ee3 Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Wed, 3 Apr 2013 16:06:07 -0700 Subject: [PATCH] msm: acpuclock-cortex: Use a polling function which doesn't sleep Acpuclock polls a register during both atomic and nonatomic scenarios. Use a macro which will work in both cases. Change-Id: Ie9f4950e8d20cf82bec26a2b5c8ebdb594f3e6af Signed-off-by: Patrick Daly --- arch/arm/mach-msm/acpuclock-cortex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-msm/acpuclock-cortex.c b/arch/arm/mach-msm/acpuclock-cortex.c index ca7fc2b0ced..74ca14528b6 100644 --- a/arch/arm/mach-msm/acpuclock-cortex.c +++ b/arch/arm/mach-msm/acpuclock-cortex.c @@ -121,7 +121,7 @@ static void select_clk_source_div(struct acpuclk_drv_data *drv_data, writel_relaxed(regval, apcs_rcg_cmd); /* Wait for the update to take effect */ - rc = readl_poll_timeout(apcs_rcg_cmd, regval, + rc = readl_poll_timeout_noirq(apcs_rcg_cmd, regval, !(regval & r->poll_mask), POLL_INTERVAL_US, APCS_RCG_UPDATE_TIMEOUT_US);