3 files changed, 13 insertions, 5 deletions

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 03d7c7521d97..9a39e0b7e583 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1304,7 +1304,7 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
         if (ios->clock) {
                 unsigned int clock_min = ~0U;
-                u32 clkdiv;
+                int clkdiv;
 
                 spin_lock_bh(&host->lock);
                 if (!host->mode_reg) {
@@ -1328,7 +1328,12 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 /* Calculate clock divider */
                 if (host->caps.has_odd_clk_div) {
                         clkdiv = DIV_ROUND_UP(host->bus_hz, clock_min) - 2;
-                        if (clkdiv > 511) {
+                        if (clkdiv < 0) {
+                                dev_warn(&mmc->class_dev,
+                                         "clock %u too fast; using %lu\n",
+                                         clock_min, host->bus_hz / 2);
+                                clkdiv = 0;
+                        } else if (clkdiv > 511) {
                                 dev_warn(&mmc->class_dev,
                                          "clock %u too slow; using %lu\n",
                                          clock_min, host->bus_hz / (511 + 2));
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 38b29265cc7c..5f5adafb253a 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -589,9 +589,11 @@ static int dw_mci_idmac_init(struct dw_mci *host)
                 host->ring_size = PAGE_SIZE / sizeof(struct idmac_desc);
 
                 /* Forward link the descriptor list */
-                for (i = 0, p = host->sg_cpu; i < host->ring_size - 1; i++, p++)
+                for (i = 0, p = host->sg_cpu; i < host->ring_size - 1; i++, p++) {
                         p->des3 = cpu_to_le32(host->sg_dma +
                                         (sizeof(struct idmac_desc) * (i + 1)));
+                        p->des1 = 0;
+                }
 
                 /* Set the last descriptor as the end-of-ring descriptor */
                 p->des3 = cpu_to_le32(host->sg_dma);
@@ -1300,7 +1302,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
         int gpio_cd = mmc_gpio_get_cd(mmc);
 
         /* Use platform get_cd function, else try onboard card detect */
-        if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
+        if ((brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) ||
+            (mmc->caps & MMC_CAP_NONREMOVABLE))
                 present = 1;
         else if (!IS_ERR_VALUE(gpio_cd))
                 present = gpio_cd;
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 2b6ef6bd5d5f..7eff087cf515 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1408,7 +1408,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
         host            = mmc_priv(mmc);
         host->mmc       = mmc;
         host->addr      = reg;
-        host->timeout   = msecs_to_jiffies(1000);
+        host->timeout   = msecs_to_jiffies(10000);
         host->ccs_enable = !pd || !pd->ccs_unsupported;
         host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present;