From 55ea447adf8ac1bdf7b740101e120b38065e88bb Mon Sep 17 00:00:00 2001 From: baitong Date: Sat, 22 Dec 2018 17:56:56 +0800 Subject: [PATCH] (CR):[kane][sdcard]block: remove QUEUE_FLAG_BYPASS for sdcard in blk_remove_req. Change-Id: I0c5a8ed3b04bd73391dcda930460d996f29fc5fc --- drivers/mmc/core/block.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 drivers/mmc/core/block.c diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c old mode 100644 new mode 100755 index 79e5acc6e964..f549b5e28567 --- 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) { -- 2.20.1