Merge commit 'v2.6.35-rc1' into for-2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / mtd / mtd_blkdevs.c

diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index e32c49cb4005964e4c1c13ce4982e495a6569b50..03e19c1965cc031885e8a288ea092b10f3fea353 100644 (file)
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -32,6 +32,7 @@ void blktrans_dev_release(struct kref *kref)
                container_of(kref, struct mtd_blktrans_dev, ref);
 
        dev->disk->private_data = NULL;
+       blk_cleanup_queue(dev->rq);
        put_disk(dev->disk);
        list_del(&dev->list);
        kfree(dev);
@@ -423,7 +424,6 @@ int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old)
        old->rq->queuedata = NULL;
        blk_start_queue(old->rq);
        spin_unlock_irqrestore(&old->queue_lock, flags);
-       blk_cleanup_queue(old->rq);
 
        /* Ask trans driver for release to the mtd device */
        mutex_lock(&old->lock);