diff --git a/[refs] b/[refs]
index 52690ab2353c..b4aa159b34d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce550c2059a67ee7834fc6f64cf895391d36a58e
+refs/heads/master: e4f869d9de18bc8272df8d0ab764178aa24bdf33
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index ac5e8b57e50f..6ab3434b2359 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -4942,10 +4942,8 @@ static int run(mddev_t *mddev)
 	return 0;
 abort:
 	md_unregister_thread(&mddev->thread);
-	if (conf) {
-		print_raid5_conf(conf);
-		free_conf(conf);
-	}
+	print_raid5_conf(conf);
+	free_conf(conf);
 	mddev->private = NULL;
 	printk(KERN_ALERT "md/raid:%s: failed to run raid set.\n", mdname(mddev));
 	return -EIO;