From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20120504204246.606929528@linuxfoundation.org> Date: Fri, 04 May 2012 13:43:04 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?UTF-8?q?Eric=20B=E9nard?= Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Wolfram Sang , Chris Ball , Jonathan Nieder Subject: [ 20/47] mmc: unbreak sdhci-esdhc-imx on i.MX25 In-Reply-To: <20120504204307.GA13761@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric B�nard 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 Acked-by: Wolfram Sang Signed-off-by: Chris Ball Signed-off-by: Jonathan Nieder Signed-off-by: Greg Kroah-Hartman --- Thanks, Jonathan drivers/mmc/host/sdhci-esdhc-imx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- 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 } 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 */