---

yaml --- r: 353721 b: refs/heads/master c: 4fa3e78 h: refs/heads/master i: 353719: 26554fc v: v3
git-mirror · Feb 4, 2013 · 35449eb · 35449eb
1 parent 5e6b999
commit 35449eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 422d26b6ecd77af8c77f2a40580679459825170f
+refs/heads/master: 4fa3e78be7e985ca814ce2aa0c09cbee404efcf7
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
@@ -290,7 +290,7 @@ int bus_for_each_dev(struct bus_type *bus, struct device *start,
 	struct device *dev;
 	int error = 0;
 
-	if (!bus)
+	if (!bus || !bus->p)
 		return -EINVAL;
 
 	klist_iter_init_node(&bus->p->klist_devices, &i,
@@ -324,7 +324,7 @@ struct device *bus_find_device(struct bus_type *bus,
 	struct klist_iter i;
 	struct device *dev;
 
-	if (!bus)
+	if (!bus || !bus->p)
 		return NULL;
 
 	klist_iter_init_node(&bus->p->klist_devices, &i,