diff --git a/block/partition-generic.c b/block/partition-generic.c
index 2261566741f449c53ba613f9a341b9b445d93ac3..c4ac7a8c77dc5dd5937794a21b9909f3908a5bad 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -464,7 +464,7 @@ static int drop_partitions(struct gendisk *disk, struct block_device *bdev)
 	struct hd_struct *part;
 	int res;
 
-	if (bdev->bd_part_count)
+	if (bdev->bd_part_count || bdev->bd_super)
 		return -EBUSY;
 	res = invalidate_partition(disk, 0);
 	if (res)