Merge branch 'lsk-v4.4-eas-v5.2' of git://git.linaro.org/arm/eas/kernel.git

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / core / mmc_ops.c

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 1f444269ebbe66027831757403d1bdd53d1b6a8d..2c90635c89afbb3782a48145fe830828dca4ec27 100644 (file)
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -489,6 +489,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
        unsigned long timeout;
        u32 status = 0;
        bool use_r1b_resp = use_busy_signal;
+       bool expired = false;
 
        mmc_retune_hold(host);
 
@@ -545,6 +546,12 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
        timeout = jiffies + msecs_to_jiffies(timeout_ms);
        do {
                if (send_status) {
+                       /*
+                        * Due to the possibility of being preempted after
+                        * sending the status command, check the expiration
+                        * time first.
+                        */
+                       expired = time_after(jiffies, timeout);
                        err = __mmc_send_status(card, &status, ignore_crc);
                        if (err)
                                goto out;
@@ -565,7 +572,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                }
 
                /* Timeout if the device never leaves the program state. */
-               if (time_after(jiffies, timeout)) {
+               if (expired && R1_CURRENT_STATE(status) == R1_STATE_PRG) {
                        pr_err("%s: Card stuck in programming state! %s\n",
                                mmc_hostname(host), __func__);
                        err = -ETIMEDOUT;