1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 4e4bfde3db5d..2d2ca7fa0265 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -462,10 +462,6 @@ static int multipath_run (mddev_t *mddev)
        }
        memset(conf->multipaths, 0, sizeof(struct multipath_info)*mddev->raid_disks);
-        mddev->queue->unplug_fn = multipath_unplug;
-        mddev->queue->issue_flush_fn = multipath_issue_flush;
        conf->working_disks = 0;
        ITERATE_RDEV(mddev,rdev,tmp) {
                disk_idx = rdev->raid_disk;
@@ -528,13 +524,16 @@ static int multipath_run (mddev_t *mddev)
         * Ok, everything is just fine now
         */
        mddev->array_size = mddev->size;
+        mddev->queue->unplug_fn = multipath_unplug;
+        mddev->queue->issue_flush_fn = multipath_issue_flush;
        return 0;
 out_free_conf:
        if (conf->pool)
                mempool_destroy(conf->pool);
-        if (conf->multipaths)
+        kfree(conf->multipaths);
-                kfree(conf->multipaths);
        kfree(conf);
        mddev->private = NULL;
 out: