diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-14 14:25:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-14 14:25:38 +0100 |
| commit | abf239657b88fa7e75d5b44a65a4177e7bb8acce (patch) | |
| tree | 8a058b417ecde9d6ce9518844393d09092cbc431 /arch/arm | |
| parent | [ARM] omap: fix omap2_divisor_to_clksel() error return value (diff) | |
| download | linux-abf239657b88fa7e75d5b44a65a4177e7bb8acce.tar.xz linux-abf239657b88fa7e75d5b44a65a4177e7bb8acce.zip | |
[ARM] omap: fix _omap2_clksel_get_src_field()
_omap2_clksel_get_src_field() was returning the first entry which was
either the default _or_ applicable to the SoC. This is wrong - we
should be returning the first default which is applicable to the SoC.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 2899cba2aaa0..e64549e4e326 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -708,7 +708,7 @@ static u32 omap2_clksel_get_src_field(void __iomem **src_addr, return 0; for (clkr = clks->rates; clkr->div; clkr++) { - if (clkr->flags & (cpu_mask | DEFAULT_RATE)) + if (clkr->flags & cpu_mask && clkr->flags & DEFAULT_RATE) break; /* Found the default rate for this platform */ } |