diff options
| author | Seungwon Jeon <tgih.jun@samsung.com> | 2013-01-22 19:48:07 +0900 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2013-03-11 02:40:30 -0700 |
| commit | 8aa86487a5d51a52e68c39de8529babfd3e77c2b (patch) | |
| tree | 8d1f0b9a5a55cce550f13238ec6aaf49404e1d99 /drivers/mmc | |
| parent | 3ed4f08019293bd0f7e1ab67b623f87ee0bdc9c3 (diff) | |
mmc: block: don't start new request when the card is removed
It's not necessary to start a new request while error handling if
the card was removed.
Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
(cherry picked from commit 7a81902fa52f2b6f5037e167f74ebb5a41cfc7d1)
Bug 1242730
Change-Id: Ia585664bc4125af9b0f121237f79ed3e5d45c910
Signed-off-by: Naveen Kumar Arepalli <naveenk@nvidia.com>
Reviewed-on: http://git-master/r/206930
Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com>
Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 09d7fa3ad2db..ed247a059108 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1394,8 +1394,14 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) ret = blk_end_request(req, -EIO, blk_rq_cur_bytes(req)); start_new_req: if (rqc) { - mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq); - mmc_start_req(card->host, &mq->mqrq_cur->mmc_active, NULL); + if (mmc_card_removed(card)) { + rqc->cmd_flags |= REQ_QUIET; + blk_end_request_all(rqc, -EIO); + } else { + mmc_blk_rw_rq_prep(mq->mqrq_cur, card, 0, mq); + mmc_start_req(card->host, + &mq->mqrq_cur->mmc_active, NULL); + } } return 0; |