diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2011-09-23 12:48:20 +0300 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-10-26 16:32:14 -0400 |
| commit | 0d7d85ca6e5dc7bd426d1d5989a44e93e8c7a0d3 (patch) | |
| tree | 08d4f1be8e4bdab4053721c982b47ccb20926d5d /drivers/mmc | |
| parent | b87d8dbf6c410b5f2d9b6893c85baa06aa131c7c (diff) | |
| download | linux-3.10-0d7d85ca6e5dc7bd426d1d5989a44e93e8c7a0d3.tar.gz linux-3.10-0d7d85ca6e5dc7bd426d1d5989a44e93e8c7a0d3.tar.bz2 linux-3.10-0d7d85ca6e5dc7bd426d1d5989a44e93e8c7a0d3.zip | |
mmc: block: fix boot partition switch error path
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 66c7596c554..d7eb2c08233 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -447,18 +447,23 @@ static inline int mmc_blk_part_switch(struct mmc_card *card, { int ret; struct mmc_blk_data *main_md = mmc_get_drvdata(card); + if (main_md->part_curr == md->part_type) return 0; if (mmc_card_mmc(card)) { - card->ext_csd.part_config &= ~EXT_CSD_PART_CONFIG_ACC_MASK; - card->ext_csd.part_config |= md->part_type; + u8 part_config = card->ext_csd.part_config; + + part_config &= ~EXT_CSD_PART_CONFIG_ACC_MASK; + part_config |= md->part_type; 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); if (ret) return ret; + + card->ext_csd.part_config = part_config; } 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); if (ret) { + if (req) { + spin_lock_irq(&md->lock); + __blk_end_request_all(req, -EIO); + spin_unlock_irq(&md->lock); + } ret = 0; goto out; } |