Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md: Fix new incorrect error return from do_md_stop.
git-mirror · Aug 18, 2009 · 435a71d · 435a71d
2 parents df4ecf1 + 80ffb3c
commit 435a71d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/md/md.c b/drivers/md/md.c
@@ -4364,6 +4364,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
 		if (mode == 1)
 			set_disk_ro(disk, 1);
 		clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
+		err = 0;
 	}
 out:
 	mutex_unlock(&mddev->open_mutex);