Merge branch 'linux-2.6' into for-linus

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c
index f9027c8db792..87713572293f 100644
--- a/drivers/mmc/mmc_block.c
+++ b/drivers/mmc/mmc_block.c
@@ -83,7 +83,6 @@ static void mmc_blk_put(struct mmc_blk_data *md)
         md->usage--;
         if (md->usage == 0) {
                 put_disk(md->disk);
-                mmc_cleanup_queue(&md->queue);
                 kfree(md);
         }
         mutex_unlock(&open_lock);
@@ -225,10 +224,10 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
         struct mmc_blk_data *md = mq->data;
         struct mmc_card *card = md->queue.card;
         struct mmc_blk_request brq;
-        int ret;
+        int ret = 1;
 
         if (mmc_card_claim_host(card))
-                goto cmd_err;
+                goto flush_queue;
 
         do {
                 struct mmc_command cmd;
@@ -345,8 +344,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
         return 1;
 
  cmd_err:
-        ret = 1;
-
         /*
          * If this is an SD card and we're writing, we can first
          * mark the known good sectors as ok.
@@ -380,6 +377,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 
         mmc_card_release_host(card);
 
+flush_queue:
         spin_lock_irq(&md->lock);
         while (ret) {
                 ret = end_that_request_chunk(req, 0,
@@ -553,12 +551,11 @@ static void mmc_blk_remove(struct mmc_card *card)
         if (md) {
                 int devidx;
 
+                /* Stop new requests from getting into the queue */
                 del_gendisk(md->disk);
 
-                /*
-                 * I think this is needed.
-                 */
-                md->disk->queue = NULL;
+                /* Then flush out any already in there */
+                mmc_cleanup_queue(&md->queue);
 
                 devidx = md->disk->first_minor >> MMC_SHIFT;
                 __clear_bit(devidx, dev_use);