diff --git a/block/genhd.c b/block/genhd.c
index 3c34dd01158549fa1f72d82bab832d11e2b52c29..83f407e1563a5f356867da1b8377bfe4a82f82c8 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -770,6 +770,13 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode)
 	else
 		blkdev_put(bdev, mode & ~FMODE_EXCL);
 
+	/*
+	 * If blkdev_get_by_dev() failed early, GD_NEED_PART_SCAN is still set,
+	 * and this will cause that re-assemble partitioned raid device will
+	 * creat partition for underlying disk.
+	 */
+	clear_bit(GD_NEED_PART_SCAN, &disk->state);
+
 	if (!(mode & FMODE_EXCL)) {
 		bd_abort_claiming(claim, claim, disk_scan_partitions);
 		bdput(claim);