diff --git a/[refs] b/[refs]
index 628fd9573007..624351bac7cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 126925c090155f13e90b9e7e8c4010e96027c00a
+refs/heads/master: ddcf3522cf03a147c867a2e0155761652dbd156a
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index bdd9bba577b0..f20d13e717d5 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -1643,7 +1643,9 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
 		bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
 		if (rdev->sb_size & bmask)
 			rdev->sb_size = (rdev->sb_size | bmask) + 1;
-	}
+	} else
+		max_dev = le32_to_cpu(sb->max_dev);
+
 	for (i=0; i<max_dev;i++)
 		sb->dev_roles[i] = cpu_to_le16(0xfffe);