2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9bd9891..9fd831f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Changes Prior to this release
     -   Remove error in md_open if array is already active.  This isn't
 	needed and gets in the ways if an array was created e.g. in
 	initramfs, but device doesn't yet exist in /dev.
+    -   When --assemble --scan is run, if all arrays that could be found
+	have already been started, don't report an error.
 
 Changes Prior to 2.5.4 release
     -   When creating devices in /dev/md/ create matching symlinks
diff --git a/mdadm.c b/mdadm.c
index bc8aac8..00514a6 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -1033,7 +1033,7 @@ int main(int argc, char *argv[])
 				}
 				if (ioctl(mdfd, GET_ARRAY_INFO, &array)>=0)
 					/* already assembled, skip */
-					;
+					cnt++;
 				else {
 					rv |= Assemble(ss, array_list->devname, mdfd,
 						       array_list,