diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index ebb7adba44d6cfdc66f70db3edf96f8a8add40aa..dc3f405e1280bffa4c5e9b486848fa676cb505ee 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3066,7 +3066,6 @@ static struct r1conf *setup_conf(struct mddev *mddev)
 	return ERR_PTR(err);
 }
 
-static void raid1_free(struct mddev *mddev, void *priv);
 static int raid1_run(struct mddev *mddev)
 {
 	struct r1conf *conf;
@@ -3125,8 +3124,7 @@ static int raid1_run(struct mddev *mddev)
 	 */
 	if (conf->raid_disks - mddev->degraded < 1) {
 		md_unregister_thread(&conf->thread);
-		ret = -EINVAL;
-		goto abort;
+		return -EINVAL;
 	}
 
 	if (conf->raid_disks - mddev->degraded == 1)
@@ -3159,14 +3157,8 @@ static int raid1_run(struct mddev *mddev)
 	}
 
 	ret = md_integrity_register(mddev);
-	if (ret) {
+	if (ret)
 		md_unregister_thread(&mddev->thread);
-		goto abort;
-	}
-	return 0;
-
-abort:
-	raid1_free(mddev, conf);
 	return ret;
 }