summaryrefslogtreecommitdiff
path: root/drivers/md/multipath.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-06-23 11:26:22 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-06-23 11:26:22 +0100
commit3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch)
treeceba46966a5a1112a05d257d8ecb25ae5eee95e0 /drivers/md/multipath.c
parent364f6c717deef4a3ac4982e670fa9846b43cd060 (diff)
parentee98689be1b054897ff17655008c3048fe88be94 (diff)
downloadlinux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.gz
linux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.xz
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/md/multipath.c')
-rw-r--r--drivers/md/multipath.c3
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: