From: Jaehoon Chung Date: Fri, 2 Aug 2013 14:08:58 +0000 (+0900) Subject: mmc: sdhci-s3c: fix the wrong register value, when clock is disabled X-Git-Tag: v3.12-rc1~69^2~3 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=7ef2a5e2f72325fd83c6e1ab76b139ca31c7f8ed;hp=490104ac597b8b4c858a6a6889a60d8897181baf;p=cascardo%2Flinux.git mmc: sdhci-s3c: fix the wrong register value, when clock is disabled When use the QUIRK_NONSTANDARD_CLOCK, then never set to 0 at clock control register. This patch fixes this problem. Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 926aaf6acc67..1572b6a935b9 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -296,9 +296,12 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock) unsigned long timeout; u16 clk = 0; - /* don't bother if the clock is going off */ - if (clock == 0) + /* If the clock is going off, set to 0 at clock control register */ + if (clock == 0) { + sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); + host->clock = clock; return; + } sdhci_s3c_set_clock(host, clock);