diff --git a/[refs] b/[refs]
index 39704e22a5f5..0a79e71ef0d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af8a24347f966ab9fae6b0f127d1fbc9d6932d3a
+refs/heads/master: 52c64152a935e63d9ff73ce823730c9a23dedbff
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index f97c3b2f2f89..d730e8f513a7 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -2546,7 +2546,8 @@ state_show(struct md_rdev *rdev, char *page)
 		sep = ",";
 	}
 	if (test_bit(Blocked, &rdev->flags) ||
-	    rdev->badblocks.unacked_exist) {
+	    (rdev->badblocks.unacked_exist
+	     && !test_bit(Faulty, &rdev->flags))) {
 		len += sprintf(page+len, "%sblocked", sep);
 		sep = ",";
 	}