Merge branch 'for-linus' of git://neil.brown.name/md

[~andy/linux] / drivers / md / multipath.c

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 3535c23af288e8eaac45042eb2e1909af8f0759a..d5b5fb3001717d6c5436389615c38044b9bb3b9a 100644 (file)
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -514,8 +514,7 @@ static int multipath_stop (mddev_t *mddev)
 {
        multipath_conf_t *conf = mddev->private;
 
-       md_unregister_thread(mddev->thread);
-       mddev->thread = NULL;
+       md_unregister_thread(&mddev->thread);
        blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
        mempool_destroy(conf->pool);
        kfree(conf->multipaths);