leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: block: fix boot partition switch error path

Browse Source 
In the case of a switch error, do not update partition config as though
the switch succeeded, and ensure blk_end_request is called on the
failed request.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Andrei Warkentin <andrey.warkentin@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Adrian Hunter 2011-09-23 12:48:20 +03:00 committed by Chris Ball
parent b87d8dbf6c
commit 0d7d85ca6e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/mmc/card/block.c
View File

@ -447,18 +447,23 @@ static inline int mmc_blk_part_switch(struct mmc_card *card,
{ {
int ret; int ret;
struct mmc_blk_data *main_md = mmc_get_drvdata(card); struct mmc_blk_data *main_md = mmc_get_drvdata(card);
if (main_md->part_curr == md->part_type) if (main_md->part_curr == md->part_type)
return 0; return 0;
if (mmc_card_mmc(card)) { if (mmc_card_mmc(card)) {
card->ext_csd.part_config &= ~EXT_CSD_PART_CONFIG_ACC_MASK; u8 part_config = card->ext_csd.part_config;
card->ext_csd.part_config |= md->part_type;
part_config &= ~EXT_CSD_PART_CONFIG_ACC_MASK;
part_config |= md->part_type;
ret = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, ret = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
EXT_CSD_PART_CONFIG, card->ext_csd.part_config, EXT_CSD_PART_CONFIG, part_config,
card->ext_csd.part_time); card->ext_csd.part_time);
if (ret) if (ret)
return ret; return ret;
card->ext_csd.part_config = part_config;
} }
main_md->part_curr = md->part_type; main_md->part_curr = md->part_type;
@ -1273,6 +1278,11 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
ret = mmc_blk_part_switch(card, md); ret = mmc_blk_part_switch(card, md);
if (ret) { if (ret) {
if (req) {
spin_lock_irq(&md->lock);
__blk_end_request_all(req, -EIO);
spin_unlock_irq(&md->lock);
}
ret = 0; ret = 0;
goto out; goto out;
} }