diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
| commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
| tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /arch/arm/mach-omap2/io.c | |
| parent | df127ee375af4cb40b979605e0c336fc79bd38e7 (diff) | |
| parent | 2d200665c37f544f648d77a05a06ab63328f0d3a (diff) | |
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) | |||
| 298 | return 0; | 298 | return 0; |
| 299 | 299 | ||
| 300 | dpll3_m2_ck = clk_get(NULL, "dpll3_m2_ck"); | 300 | dpll3_m2_ck = clk_get(NULL, "dpll3_m2_ck"); |
| 301 | if (!dpll3_m2_ck) | 301 | if (IS_ERR(dpll3_m2_ck)) |
| 302 | return -EINVAL; | 302 | return -EINVAL; |
| 303 | 303 | ||
| 304 | rate = clk_get_rate(dpll3_m2_ck); | 304 | rate = clk_get_rate(dpll3_m2_ck); |