commit 953c2d70b6dcac05c759aa39aaecab5a4d71d270
author Linux Build Service Account <lnxbuild@localhost> Tue Mar 18 20:10:39 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 18 20:10:38 2014 -0700
tree 0bf13fef8b72822dbb1999a535fa36e217308d82
parent 55af424a47a659ff4ba7e8bcca365cd1af2bfdf7
parent 784f6e0d2cd5ef3f8bf32e4c6737cc1f0b81a044

Merge "mmc: sdhci: Use right API to read/write host control2 register"

drivers/mmc/host/sdhci.c

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index fffce5c..32ff175 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -71,7 +71,7 @@
 
 static inline int sdhci_get_async_int_status(struct sdhci_host *host)
 {
-	return (sdhci_readl(host, SDHCI_HOST_CONTROL2) &
+	return (sdhci_readw(host, SDHCI_HOST_CONTROL2) &
 		 SDHCI_CTRL_ASYNC_INT_ENABLE) >> 14;
 }
 
@@ -1592,12 +1592,12 @@
 		return;
 
 	if (enable)
-		sdhci_writel(host,
-			     sdhci_readl(host, SDHCI_HOST_CONTROL2) |
+		sdhci_writew(host,
+			     sdhci_readw(host, SDHCI_HOST_CONTROL2) |
 			     SDHCI_CTRL_ASYNC_INT_ENABLE,
 			     SDHCI_HOST_CONTROL2);
 	else
-		sdhci_writel(host, sdhci_readl(host, SDHCI_HOST_CONTROL2) &
+		sdhci_writew(host, sdhci_readw(host, SDHCI_HOST_CONTROL2) &
 			     ~SDHCI_CTRL_ASYNC_INT_ENABLE,
 			     SDHCI_HOST_CONTROL2);
 }