From 04f55f7345fe141a203969359a140b554728ede8 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 12 May 2009 16:07:40 +0900
Subject: [PATCH] --- yaml --- r: 146824 b: refs/heads/master c:
 f3f8290cb3fa4aa627321530bb85d5f35e487433 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sh/kernel/cpu/clock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 43f2ecda89ca..60d32706a8d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dae89572cbcd5f676ea52a9448d9639d97a53d6
+refs/heads/master: f3f8290cb3fa4aa627321530bb85d5f35e487433
diff --git a/trunk/arch/sh/kernel/cpu/clock.c b/trunk/arch/sh/kernel/cpu/clock.c
index 34707b867760..9e1fc133a473 100644
--- a/trunk/arch/sh/kernel/cpu/clock.c
+++ b/trunk/arch/sh/kernel/cpu/clock.c
@@ -399,7 +399,7 @@ struct clk *clk_get(struct device *dev, const char *id)
 	int idno;
 
 	clk = clk_get_sys(dev_id, id);
-	if (clk)
+	if (clk && !IS_ERR(clk))
 		return clk;
 
 	if (dev == NULL || dev->bus != &platform_bus_type)