aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/io.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-01-11 15:10:08 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-01-11 15:10:08 +1100
commiteed0ba0b4ab2d1668588219a8efa81bf8636a12d (patch)
treef5aa3c732e7830a1b24e6071f8bed0f799881187 /arch/arm/mach-omap2/io.c
parent98b14d6b290d96b24ae993ceaccc59b2aa4b130c (diff)
parentc9de9333f5a860cab82052bce6ac28bcac9b2c26 (diff)
downloadkernel_samsung_smdk4412-eed0ba0b4ab2d1668588219a8efa81bf8636a12d.zip
kernel_samsung_smdk4412-eed0ba0b4ab2d1668588219a8efa81bf8636a12d.tar.gz
kernel_samsung_smdk4412-eed0ba0b4ab2d1668588219a8efa81bf8636a12d.tar.bz2
Merge remote branch 'gcl/next' into next
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r--arch/arm/mach-omap2/io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 40562dd..a1939b1 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -297,7 +297,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);