---

yaml --- r: 288840 b: refs/heads/master c: 2b31594 h: refs/heads/master v: v3
git-mirror · Jan 24, 2012 · c8dae21 · c8dae21
1 parent f807b9b
commit c8dae21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c56d8a7362665d165ba992b6b7a8d6c13a26eafc
+refs/heads/master: 2b31594a9523449b168946725689d039c80204de
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
@@ -1193,13 +1193,15 @@ EXPORT_SYMBOL_GPL(subsys_interface_register);
 
 void subsys_interface_unregister(struct subsys_interface *sif)
 {
-	struct bus_type *subsys = sif->subsys;
+	struct bus_type *subsys;
 	struct subsys_dev_iter iter;
 	struct device *dev;
 
-	if (!sif)
+	if (!sif || !sif->subsys)
 		return;
 
+	subsys = sif->subsys;
+
 	mutex_lock(&subsys->p->mutex);
 	list_del_init(&sif->node);
 	if (sif->remove_dev) {