From 8b8f59543c719e4536848b1458d89869f9877b40 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 15 Apr 2009 16:00:12 -0700
Subject: [PATCH] --- yaml --- r: 143624 b: refs/heads/master c:
 014c90dbb9b63bae067afc80a7931a76c5268ae3 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/base/core.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0ea4b87709c9..1a97be92055a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ccb457966391295bd9b3644f6bdc9ddd97b6051
+refs/heads/master: 014c90dbb9b63bae067afc80a7931a76c5268ae3
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index e73c92d13a23..d230ff4b3eec 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -1142,6 +1142,9 @@ int device_for_each_child(struct device *parent, void *data,
 	struct device *child;
 	int error = 0;
 
+	if (!parent->p)
+		return 0;
+
 	klist_iter_init(&parent->p->klist_children, &i);
 	while ((child = next_device(&i)) && !error)
 		error = fn(child, data);