diff options
| author | Eric Bénard <eric@eukrea.com> | 2012-04-27 17:31:18 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 08:56:35 -0700 |
| commit | dbe7f938e41ed62242b4dfc1fc77f918646fad5c (patch) | |
| tree | 32b83e9896044242e387c0769b4b8a0b9be96446 /drivers/mmc | |
| parent | a674bcab9066a2b2541d8276f5e9ff86f50ce13e (diff) | |
| download | kernel_samsung_aries-dbe7f938e41ed62242b4dfc1fc77f918646fad5c.zip kernel_samsung_aries-dbe7f938e41ed62242b4dfc1fc77f918646fad5c.tar.gz kernel_samsung_aries-dbe7f938e41ed62242b4dfc1fc77f918646fad5c.tar.bz2 | |
mmc: unbreak sdhci-esdhc-imx on i.MX25
commit b89152824f993a9572b47eb31f4579feadeac34c upstream.
This was broken by me in 37865fe91582582a6f6c00652f6a2b1ff71f8a78
("mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci") where more
extensive tests would have shown that read or write of data to the
card were failing (even if the partition table was correctly read).
Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 92e5437..6fe8ced 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -245,8 +245,7 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd } pltfm_host->priv = imx_data; - if (!cpu_is_mx25()) - host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; + host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; if (cpu_is_mx25() || cpu_is_mx35()) { /* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */ |