2 files changed, 9 insertions, 10 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 56e24c072b62..d7690f86fdb9 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1501,12 +1501,12 @@ static void error(struct mddev *mddev, struct md_rdev *rdev)
                 mddev->degraded++;
                 set_bit(Faulty, &rdev->flags);
                 spin_unlock_irqrestore(&conf->device_lock, flags);
-                /*
-                 * if recovery is running, make sure it aborts.
-                 */
-                set_bit(MD_RECOVERY_INTR, &mddev->recovery);
         } else
                 set_bit(Faulty, &rdev->flags);
+        /*
+         * if recovery is running, make sure it aborts.
+         */
+        set_bit(MD_RECOVERY_INTR, &mddev->recovery);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
         printk(KERN_ALERT
                "md/raid1:%s: Disk failure on %s, disabling device.\n"
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index cb882aae9e20..b08c18871323 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1684,13 +1684,12 @@ static void error(struct mddev *mddev, struct md_rdev *rdev)
                 spin_unlock_irqrestore(&conf->device_lock, flags);
                 return;
         }
-        if (test_and_clear_bit(In_sync, &rdev->flags)) {
+        if (test_and_clear_bit(In_sync, &rdev->flags))
                 mddev->degraded++;
-                        /*
-                 * if recovery is running, make sure it aborts.
-                 */
-                set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-        }
+        /*
+         * If recovery is running, make sure it aborts.
+         */
+        set_bit(MD_RECOVERY_INTR, &mddev->recovery);
         set_bit(Blocked, &rdev->flags);
         set_bit(Faulty, &rdev->flags);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);