mmc: Fix mmc_switch excessive timeout

Fix branching to avoid premature falling back on a long timeout instead
of continuation of the initialization attempt.

Clear of the comment to avoid the ambiguity.

Signed-off-by: Kirill Kapranov <kirill.kapranov@compulab.co.il>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Ye Li <ye.li@nxp.com>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Tested-by: Marek Behún <marek.behun@nic.cz>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index ba54b19c140b1a145c4b25bc789596f9206aba55..4d9871d69f202cfe80d9b99243d09e15e893693a 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -819,11 +819,11 @@ static int __mmc_switch(struct mmc *mmc, u8 set, u8 index, u8 value,
                return ret;
 
        /*
-        * In cases when not allowed to poll by using CMD13 or because we aren't
+        * In cases when neiter allowed to poll by using CMD13 nor we are
         * capable of polling by using mmc_wait_dat0, then rely on waiting the
         * stated timeout to be sufficient.
         */
-       if (ret == -ENOSYS || !send_status) {
+       if (ret == -ENOSYS && !send_status) {
                mdelay(timeout_ms);
                return 0;
        }