1 files changed, 2 insertions, 1 deletions

diff --git a/block/bsg.c b/block/bsg.c
index 4eebcd5c7311..1ba9bc6d9a44 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -932,7 +932,8 @@ void bsg_unregister_queue(struct request_queue *q)
 {
         struct bsg_class_device *bcd = &q->bsg_dev;
 
-        WARN_ON(!bcd->class_dev);
+        if (!bcd->class_dev)
+                return;
 
         mutex_lock(&bsg_mutex);
         sysfs_remove_link(&q->kobj, "bsg");