mmc: sdhci: remove unneeded call when have preset value quirk
authorDong Aisheng <b29396@freescale.com>
Fri, 18 Oct 2013 11:48:50 +0000 (19:48 +0800)
committerChris Ball <chris@printf.net>
Mon, 21 Oct 2013 19:58:23 +0000 (15:58 -0400)
Remove unneeded call of call sdhci_enable_preset_value when having
SDHCI_QUIRK2_PRESET_VALUE_BROKEN.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sdhci.c

index cbde17d97e9dae6cfe31bb775e8937d2adc5af59..a21a71056dd012dc13e673d44ca37769e0fd95d9 100644 (file)
@@ -1435,7 +1435,8 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
        }
 
        if (host->version >= SDHCI_SPEC_300 &&
-               (ios->power_mode == MMC_POWER_UP))
+               (ios->power_mode == MMC_POWER_UP) &&
+               !(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN))
                sdhci_enable_preset_value(host, false);
 
        sdhci_set_clock(host, ios->clock);