---

yaml --- r: 86880 b: refs/heads/master c: c1fe539 h: refs/heads/master v: v3
git-mirror · Mar 4, 2008 · a6de3c9 · a6de3c9
1 parent d60e4d7
commit a6de3c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 135dee0cd0eb2638fab899b428e51f00e8c046a8
+refs/heads/master: c1fe539a7e031302af1d121163e7ce68e679ba8c
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
@@ -621,7 +621,8 @@ static struct kobject *get_device_parent(struct device *dev,
 static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir)
 {
 	/* see if we live in a "glue" directory */
-	if (!dev->class || glue_dir->kset != &dev->class->class_dirs)
+	if (!glue_dir || !dev->class ||
+	    glue_dir->kset != &dev->class->class_dirs)
 		return;
 
 	kobject_put(glue_dir);
@@ -773,7 +774,7 @@ int device_add(struct device *dev)
 	dev = get_device(dev);
 	if (!dev || !strlen(dev->bus_id)) {
 		error = -EINVAL;
-		goto Error;
+		goto Done;
 	}
 
 	pr_debug("device: '%s': %s\n", dev->bus_id, __FUNCTION__);