drivers/net/ne2000_base.c: Fix GCC 4.6 build warnings

[u-boot] / drivers / mmc / mv_sdhci.c

diff --git a/drivers/mmc/mv_sdhci.c b/drivers/mmc/mv_sdhci.c
index f92caeb8fd5f43884e720f311fc9e3f58b03f6d2..1501974e2f575eb2784dec176335e4b84db2c2bc 100644 (file)
--- a/drivers/mmc/mv_sdhci.c
+++ b/drivers/mmc/mv_sdhci.c
@@ -48,7 +48,10 @@ int mv_sdh_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks)
                mv_ops.write_b = mv_sdhci_writeb;
        host->ops = &mv_ops;
 #endif
-       host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
+       if (quirks & SDHCI_QUIRK_REG32_RW)
+               host->version = sdhci_readl(host, SDHCI_HOST_VERSION - 2) >> 16;
+       else
+               host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
        add_sdhci(host, max_clk, min_clk);
        return 0;
 }