diff --git a/[refs] b/[refs]
index ee44af607e6f..646a65f031b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39dca558a5b52b63e49bc234a7e887be092aa690
+refs/heads/master: df468820b6881fc14e50f6b2fcffd3e945417d68
diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c
index 4eebcd5c7311..1ba9bc6d9a44 100644
--- a/trunk/block/bsg.c
+++ b/trunk/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");