[PATCH 1/3] ARM: also support TWD clock, instantiated from platform data

[Guennadi Liakhovetski]

While gradually switching clock initialisation to DT some architectures
can have TWD device in DT, but supplying clock initialised from platform
data. This patch adds support for such configurations to ARM.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas at gmail.com>
Cc: Russell King <linux at arm.linux.org.uk>
---
 arch/arm/kernel/smp_twd.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 3f25650..8f12aa3 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -244,7 +244,7 @@ static void twd_get_clock(struct device_node *np)
 
 	if (np)
 		twd_clk = of_clk_get(np, 0);
-	else
+	if (IS_ERR(twd_clk))
 		twd_clk = clk_get_sys("smp_twd", NULL);
 
 	if (IS_ERR(twd_clk)) {
-- 
1.7.2.5