(CR):[kane][sdcard]block: remove QUEUE_FLAG_BYPASS for sdcard in blk_remove_req.

Change-Id: I0c5a8ed3b04bd73391dcda930460d996f29fc5fc

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
old mode 100644 (file)
new mode 100755 (executable)
index 79e5acc..f549b5e
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2491,9 +2491,13 @@ static void mmc_blk_remove_req(struct mmc_blk_data *md)
                 * from being accepted.
                 */
                card = md->queue.card;
-               spin_lock_irq(md->queue.queue->queue_lock);
-               queue_flag_set(QUEUE_FLAG_BYPASS, md->queue.queue);
-               spin_unlock_irq(md->queue.queue->queue_lock);
+               if (!mmc_card_sd(card))
+               {
+                       spin_lock_irq(md->queue.queue->queue_lock);
+                       queue_flag_set(QUEUE_FLAG_BYPASS, md->queue.queue);
+                       spin_unlock_irq(md->queue.queue->queue_lock);
+               }
+
                blk_set_queue_dying(md->queue.queue);
                mmc_cleanup_queue(&md->queue);
                if (md->disk->flags & GENHD_FL_UP) {