]> nv-tegra.nvidia Code Review - linux-2.6.git/blobdiff - drivers/mmc/host/sdhci-of.c
sdhci-of: Fix the wrong accessor to HOSTVER register
[linux-2.6.git] / drivers / mmc / host / sdhci-of.c
index 09cc597c63167b14ac58aa90c1bec37ef6d55f76..128c614d11aa2d8d2446762cf1e97a123d2f99e5 100644 (file)
@@ -55,7 +55,13 @@ static u32 esdhc_readl(struct sdhci_host *host, int reg)
 
 static u16 esdhc_readw(struct sdhci_host *host, int reg)
 {
-       return in_be16(host->ioaddr + (reg ^ 0x2));
+       u16 ret;
+
+       if (unlikely(reg == SDHCI_HOST_VERSION))
+               ret = in_be16(host->ioaddr + reg);
+       else
+               ret = in_be16(host->ioaddr + (reg ^ 0x2));
+       return ret;
 }
 
 static u8 esdhc_readb(struct sdhci_host *host, int reg)