diff --git a/[refs] b/[refs]
index ba6088ffd6f3..4770a3d3e98e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3cc9ec76ba44d010f4c820c4608b91aaf28a0b9
+refs/heads/master: 3285edf152cefff482f95ceb90b1bd46ac169df1
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 6d3a2a09cd90..f920e50ea124 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -2858,7 +2858,7 @@ static inline sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *ski
 	 * to resync, then assert that we are finished, because there is
 	 * nothing we can do.
 	 */
-	if (mddev->degraded >= (data_disks - raid_disks) &&
+	if (mddev->degraded >= conf->max_degraded &&
 	    test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
 		sector_t rv = (mddev->size << 1) - sector_nr;
 		*skipped = 1;