Commit 7701885e authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson

mmc: block: Check the timeout correctly in card_busy_detect()

Pedantically, ensure the status is checked for the last time after the full
timeout has passed.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f47a1fe3
...@@ -931,6 +931,8 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, ...@@ -931,6 +931,8 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
u32 status; u32 status;
do { do {
bool done = time_after(jiffies, timeout);
err = __mmc_send_status(card, &status, 5); err = __mmc_send_status(card, &status, 5);
if (err) { if (err) {
pr_err("%s: error %d requesting status\n", pr_err("%s: error %d requesting status\n",
...@@ -951,7 +953,7 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, ...@@ -951,7 +953,7 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
* Timeout if the device never becomes ready for data and never * Timeout if the device never becomes ready for data and never
* leaves the program state. * leaves the program state.
*/ */
if (time_after(jiffies, timeout)) { if (done) {
pr_err("%s: Card stuck in programming state! %s %s\n", pr_err("%s: Card stuck in programming state! %s %s\n",
mmc_hostname(card->host), mmc_hostname(card->host),
req->rq_disk->disk_name, __func__); req->rq_disk->disk_name, __func__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment