summaryrefslogtreecommitdiff
path: root/drivers/clk/pxa
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@linaro.org>2014-11-24 17:45:33 -0800
committerMichael Turquette <mturquette@linaro.org>2014-11-24 17:45:33 -0800
commitda57b46010dd8d93aabc4c3e8d11751ac617d914 (patch)
tree1fe26ac6679ea8e76276da87582fcb95210974ed /drivers/clk/pxa
parent7f615dd43ced8dc5424ad3fa95edd6b7fbbbc27c (diff)
parentdcf3d458304aafda3d12413ade39fdf19740dbc3 (diff)
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/pxa')
-rw-r--r--drivers/clk/pxa/clk-pxa27x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/pxa/clk-pxa27x.c b/drivers/clk/pxa/clk-pxa27x.c
index bb8dfbc747ba..5f9b54b024b9 100644
--- a/drivers/clk/pxa/clk-pxa27x.c
+++ b/drivers/clk/pxa/clk-pxa27x.c
@@ -322,7 +322,7 @@ static unsigned long clk_pxa27x_memory_get_rate(struct clk_hw *hw,
unsigned long ccsr = CCSR;
osc_forced = ccsr & (1 << CCCR_CPDIS_BIT);
- a = cccr & CCCR_A_BIT;
+ a = cccr & (1 << CCCR_A_BIT);
l = ccsr & CCSR_L_MASK;
if (osc_forced || a)
@@ -341,7 +341,7 @@ static u8 clk_pxa27x_memory_get_parent(struct clk_hw *hw)
unsigned long ccsr = CCSR;
osc_forced = ccsr & (1 << CCCR_CPDIS_BIT);
- a = cccr & CCCR_A_BIT;
+ a = cccr & (1 << CCCR_A_BIT);
if (osc_forced)
return PXA_MEM_13Mhz;
if (a)