From f1e75f33822ab464fbb56c5d97d9004db75d75f2 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 8 Oct 2012 15:01:41 -0700
Subject: [PATCH] --- yaml --- r: 333320 b: refs/heads/master c:
 533b298110475804b15b93475389736140bf4aa9 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-omap2/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2ad026d7161f..4b3f6a73ab85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64de3a00a16bcdf940cbebb1b2dc05d7cc13fef5
+refs/heads/master: 533b298110475804b15b93475389736140bf4aa9
diff --git a/trunk/arch/arm/mach-omap2/timer.c b/trunk/arch/arm/mach-omap2/timer.c
index 8847d6eb2313..44f9aa7ec0c0 100644
--- a/trunk/arch/arm/mach-omap2/timer.c
+++ b/trunk/arch/arm/mach-omap2/timer.c
@@ -378,7 +378,7 @@ static void __init realtime_counter_init(void)
 		return;
 	}
 	sys_clk = clk_get(NULL, "sys_clkin_ck");
-	if (!sys_clk) {
+	if (IS_ERR(sys_clk)) {
 		pr_err("%s: failed to get system clock handle\n", __func__);
 		iounmap(base);
 		return;