Merge branch 'linus'

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index d05e3125d298..5ed2228745cb 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -213,8 +213,11 @@ static void mddev_put(mddev_t *mddev)
                 return;
         if (!mddev->raid_disks && list_empty(&mddev->disks)) {
                 list_del(&mddev->all_mddevs);
-                blk_put_queue(mddev->queue);
+                /* that blocks */
+                blk_cleanup_queue(mddev->queue);
+                /* that also blocks */
                 kobject_unregister(&mddev->kobj);
+                /* result blows... */
         }
         spin_unlock(&all_mddevs_lock);
 }