Skip to contentSkip to conversation

ARM: OMAP: fix return value check in realtime_counter_init()

PATCH New Wei Yongjun 2 participants 2 messages Oct 7, 2012 – Oct 8, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: OMAP: fix return value check in realtime_counter_init()

From: Wei Yongjun <[email protected]>

In case of error, the function clk_get() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

---
 arch/arm/mach-omap2/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/timer.c +1 -1
index 8847d6e..44f9aa7 100644
@@ -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;
maintainer
#1 lore raw

PATCH 1/1 ARM: OMAP: fix return value check in realtime_counter_init()

Quoted 5 lines · Wei Yongjun

From: Wei Yongjun <[email protected]>

In case of error, the function clk_get() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

Thanks applying into omap fixes.

Tony

Quoted 26 lines

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

---
 arch/arm/mach-omap2/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/timer.c +1 -2
index 8847d6e..44f9aa7 100644
@@ -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;
 
--

To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html