From 5657588446bc24d5815195084abccab0626b4045 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Mon, 10 May 2010 14:01:34 +0000
Subject: [PATCH] --- yaml --- r: 191653 b: refs/heads/master c:
 d97432f1014c73bbace9eb1e67742c1bcab0c3cd h: refs/heads/master i:   191651:
 6ea4178145c3d00106a2651ebe365b44508c73a4 v: v3

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

diff --git a/[refs] b/[refs]
index ab88dcc7cbbe..3055dc8e7db6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd30401b07fdcf21e4be87fd276d1b2c84d712a3
+refs/heads/master: d97432f1014c73bbace9eb1e67742c1bcab0c3cd
diff --git a/trunk/arch/sh/kernel/cpu/clock.c b/trunk/arch/sh/kernel/cpu/clock.c
index 9ded1bc29260..073f4ffe956a 100644
--- a/trunk/arch/sh/kernel/cpu/clock.c
+++ b/trunk/arch/sh/kernel/cpu/clock.c
@@ -415,7 +415,7 @@ struct clk *clk_get(struct device *dev, const char *id)
 
 	mutex_lock(&clock_list_sem);
 	list_for_each_entry(p, &clock_list, node) {
-		if (p->id == idno &&
+		if (p->name && p->id == idno &&
 		    strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
 			clk = p;
 			goto found;
@@ -423,7 +423,8 @@ struct clk *clk_get(struct device *dev, const char *id)
 	}
 
 	list_for_each_entry(p, &clock_list, node) {
-		if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
+		if (p->name &&
+		    strcmp(id, p->name) == 0 && try_module_get(p->owner)) {
 			clk = p;
 			break;
 		}
@@ -594,7 +595,7 @@ static int clk_debugfs_register(struct clk *c)
 			return err;
 	}
 
-	if (!c->dentry) {
+	if (!c->dentry && c->name) {
 		err = clk_debugfs_register_one(c);
 		if (err)
 			return err;