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: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index c446d17b48c408cce2c24210e46694e25eef380f..f7c387c27ac0578c51b756d161d063c517916fe4 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -931,6 +931,8 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
        u32 status;
 
        do {
+               bool done = time_after(jiffies, timeout);
+
                err = __mmc_send_status(card, &status, 5);
                if (err) {
                        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,
                 * Timeout if the device never becomes ready for data and never
                 * leaves the program state.
                 */
-               if (time_after(jiffies, timeout)) {
+               if (done) {
                        pr_err("%s: Card stuck in programming state! %s %s\n",
                                mmc_hostname(card->host),
                                req->rq_disk->disk_name, __func__);