---

yaml --- r: 62740 b: refs/heads/master c: 6826ee4 h: refs/heads/master v: v3
git-mirror · Jul 21, 2007 · 32bfb5f · 32bfb5f
1 parent ab37581
commit 32bfb5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d73f5222a618a91452d41c29f5996ce3d9c63673
+refs/heads/master: 6826ee4fdbe24c7aab56ce833ef94be81d190587
diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c
@@ -993,17 +993,18 @@ int bsg_register_queue(struct request_queue *q, const char *name)
 	if (q->kobj.sd) {
 		ret = sysfs_create_link(&q->kobj, &bcd->class_dev->kobj, "bsg");
 		if (ret)
-			goto err;
+			goto err_unregister;
 	}
 
 	list_add_tail(&bcd->list, &bsg_class_list);
 	bsg_device_nr++;
 
 	mutex_unlock(&bsg_mutex);
 	return 0;
+
+err_unregister:
+	class_device_unregister(class_dev);
 err:
-	if (class_dev)
-		class_device_destroy(bsg_class, MKDEV(bsg_major, bcd->minor));
 	mutex_unlock(&bsg_mutex);
 	return ret;
 }