diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-18 00:14:02 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-18 00:14:02 +0100 |
commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /arch/arm/mach-omap2/io.c | |
parent | omap: Fix setting omap_irq_base for 2430 (diff) | |
parent | arm: omap: add minimal support for RM-680 (diff) | |
download | linux-fea83f6a9b0a90fefca16ac3534e308f6c34144b.tar.xz linux-fea83f6a9b0a90fefca16ac3534e308f6c34144b.zip |
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 534774146ead..4605d5073a9b 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -298,7 +298,7 @@ static int __init _omap2_init_reprogram_sdrc(void) return 0; dpll3_m2_ck = clk_get(NULL, "dpll3_m2_ck"); - if (!dpll3_m2_ck) + if (IS_ERR(dpll3_m2_ck)) return -EINVAL; rate = clk_get_rate(dpll3_m2_ck); |