---

yaml --- r: 91739 b: refs/heads/master c: fb19974 h: refs/heads/master i: 91737: 30b7ad9 91735: cb5f648 v: v3
git-mirror · Apr 21, 2008 · a544eba · a544eba
1 parent a14a409
commit a544eba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2472892a3ce17b177cc0d8099a6391949c75abf2
+refs/heads/master: fb199746303a6bfd6121834ec9e810471185c530
diff --git a/trunk/block/blk-sysfs.c b/trunk/block/blk-sysfs.c
@@ -276,9 +276,12 @@ int blk_register_queue(struct gendisk *disk)
 
 	struct request_queue *q = disk->queue;
 
-	if (!q || !q->request_fn)
+	if (WARN_ON(!q))
 		return -ENXIO;
 
+	if (!q->request_fn)
+		return 0;
+
 	ret = kobject_add(&q->kobj, kobject_get(&disk->dev.kobj),
 			  "%s", "queue");
 	if (ret < 0)
@@ -300,7 +303,10 @@ void blk_unregister_queue(struct gendisk *disk)
 {
 	struct request_queue *q = disk->queue;
 
-	if (q && q->request_fn) {
+	if (WARN_ON(!q))
+		return;
+
+	if (q->request_fn) {
 		elv_unregister_queue(q);
 
 		kobject_uevent(&q->kobj, KOBJ_REMOVE);