diff --git a/block/bsg.c b/block/bsg.c
index 4eebcd5..1ba9bc6d 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -932,7 +932,8 @@
 {
 	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");