| Message ID | 1489408613-26915-3-git-send-email-adrian.hunter@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 13 March 2017 at 13:36, Adrian Hunter <adrian.hunter@intel.com> wrote: > Commit 4e1f780032c5 ("mmc: block: break out mmc_blk_rw_cmd_abort()") > assumed the request had not completed, but in one case it had. Fix that. > > Fixes: 4e1f780032c5 ("mmc: block: break out mmc_blk_rw_cmd_abort()") > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Thanks, applied for fixes! Kind regards Uffe > --- > drivers/mmc/core/block.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index e59107ca512a..05afefcfb611 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -1701,7 +1701,8 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req) > case MMC_BLK_CMD_ERR: > req_pending = mmc_blk_rw_cmd_err(md, card, brq, old_req, req_pending); > if (mmc_blk_reset(md, card->host, type)) { > - mmc_blk_rw_cmd_abort(card, old_req); > + if (req_pending) > + mmc_blk_rw_cmd_abort(card, old_req); > mmc_blk_rw_try_restart(mq, new_req); > return; > } > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index e59107ca512a..05afefcfb611 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1701,7 +1701,8 @@ static void mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *new_req) case MMC_BLK_CMD_ERR: req_pending = mmc_blk_rw_cmd_err(md, card, brq, old_req, req_pending); if (mmc_blk_reset(md, card->host, type)) { - mmc_blk_rw_cmd_abort(card, old_req); + if (req_pending) + mmc_blk_rw_cmd_abort(card, old_req); mmc_blk_rw_try_restart(mq, new_req); return; }
Commit 4e1f780032c5 ("mmc: block: break out mmc_blk_rw_cmd_abort()") assumed the request had not completed, but in one case it had. Fix that. Fixes: 4e1f780032c5 ("mmc: block: break out mmc_blk_rw_cmd_abort()") Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/mmc/core/block.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)