From a544eba946eed2591629d2cb8afada7d33ce9792 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Mon, 21 Apr 2008 09:51:06 +0200
Subject: [PATCH] --- yaml --- r: 91739 b: refs/heads/master c:
 fb199746303a6bfd6121834ec9e810471185c530 h: refs/heads/master i:   91737:
 30b7ad9dde2f471035c1c9d70d7a42e996be6431   91735:
 cb5f648cdd05c4c87e4bd1166d7c33b56981fc0f v: v3

---
 [refs]                  |  2 +-
 trunk/block/blk-sysfs.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 96039c216f54..cbb8a7be1648 100644
--- 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
index 54d0db116153..fc41d83be22b 100644
--- 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);