Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 2ae2d709cb15..2d2ca7fa0265 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -533,8 +533,7 @@ static int multipath_run (mddev_t *mddev)
 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: