Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 18 insertions, 7 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 9d4fdfa685e5..c6d1bd8d4ac4 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -496,12 +496,22 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
                 WARN_ON((desc - host->adma_desc) > (128 * 2 + 1) * 4);
         }
 
-        /*
-         * Add a terminating entry.
-         */
+        if (host->quirks & SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC) {
+                /*
+                * Mark the last descriptor as the terminating descriptor
+                */
+                if (desc != host->adma_desc) {
+                        desc -= 8;
+                        desc[0] |= 0x2; /* end */
+                }
+        } else {
+                /*
+                * Add a terminating entry.
+                */
 
-        /* nop, end, valid */
-        sdhci_set_adma_desc(desc, 0, 0, 0x3);
+                /* nop, end, valid */
+                sdhci_set_adma_desc(desc, 0, 0, 0x3);
+        }
 
         /*
          * Resync align buffer as we might have changed it.
@@ -1587,7 +1597,7 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state)
 
         sdhci_disable_card_detection(host);
 
-        ret = mmc_suspend_host(host->mmc, state);
+        ret = mmc_suspend_host(host->mmc);
         if (ret)
                 return ret;
 
@@ -1744,7 +1754,8 @@ int sdhci_add_host(struct sdhci_host *host)
         host->max_clk =
                 (caps & SDHCI_CLOCK_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT;
         host->max_clk *= 1000000;
-        if (host->max_clk == 0) {
+        if (host->max_clk == 0 || host->quirks &
+                        SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN) {
                 if (!host->ops->get_max_clock) {
                         printk(KERN_ERR
                                "%s: Hardware doesn't specify base clock "