summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2018-12-17 09:00:52 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2018-12-17 09:00:52 +0100
commit01e421feec0817bb3141eaae4c517410d193d440 (patch)
tree8ba5fb0ab6cba823e768007bf34074e3a0337373 /drivers/mmc/host/sdhci.c
parent961de0a856e3a30c0238d1269c0b17f9b179b6c3 (diff)
parente3ae3401aa19432ee4943eb0bbc2ec704d07d793 (diff)
downloadlinux-01e421feec0817bb3141eaae4c517410d193d440.tar.gz
linux-01e421feec0817bb3141eaae4c517410d193d440.tar.bz2
linux-01e421feec0817bb3141eaae4c517410d193d440.zip
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
-rw-r--r--drivers/mmc/host/sdhci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 5de845b6b4d0..a22e11a65658 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -127,12 +127,12 @@ static void sdhci_do_enable_v4_mode(struct sdhci_host *host)
{
u16 ctrl2;
- ctrl2 = sdhci_readb(host, SDHCI_HOST_CONTROL2);
+ ctrl2 = sdhci_readw(host, SDHCI_HOST_CONTROL2);
if (ctrl2 & SDHCI_CTRL_V4_MODE)
return;
ctrl2 |= SDHCI_CTRL_V4_MODE;
- sdhci_writeb(host, ctrl2, SDHCI_HOST_CONTROL);
+ sdhci_writew(host, ctrl2, SDHCI_HOST_CONTROL2);
}
/*