Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 62 insertions, 45 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 264911732756..d84c880fac84 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -708,7 +708,13 @@ static void mmc_power_up(struct mmc_host *host)
          */
         mmc_delay(10);
 
-        host->ios.clock = host->f_min;
+        if (host->f_min > 400000) {
+                pr_warning("%s: Minimum clock frequency too high for "
+                                "identification mode\n", mmc_hostname(host));
+                host->ios.clock = host->f_min;
+        } else
+                host->ios.clock = 400000;
+
         host->ios.power_mode = MMC_POWER_ON;
         mmc_set_ios(host);
 
@@ -855,61 +861,72 @@ void mmc_rescan(struct work_struct *work)
 
         mmc_bus_get(host);
 
-        if (host->bus_ops == NULL) {
-                /*
-                 * Only we can add a new handler, so it's safe to
-                 * release the lock here.
-                 */
+        /* if there is a card registered, check whether it is still present */
+        if ((host->bus_ops != NULL) && host->bus_ops->detect && !host->bus_dead)
+                host->bus_ops->detect(host);
+
+        mmc_bus_put(host);
+
+
+        mmc_bus_get(host);
+
+        /* if there still is a card present, stop here */
+        if (host->bus_ops != NULL) {
                 mmc_bus_put(host);
+                goto out;
+        }
 
-                if (host->ops->get_cd && host->ops->get_cd(host) == 0)
-                        goto out;
+        /* detect a newly inserted card */
 
-                mmc_claim_host(host);
+        /*
+         * Only we can add a new handler, so it's safe to
+         * release the lock here.
+         */
+        mmc_bus_put(host);
 
-                mmc_power_up(host);
-                mmc_go_idle(host);
+        if (host->ops->get_cd && host->ops->get_cd(host) == 0)
+                goto out;
 
-                mmc_send_if_cond(host, host->ocr_avail);
+        mmc_claim_host(host);
 
-                /*
-                 * First we search for SDIO...
-                 */
-                err = mmc_send_io_op_cond(host, 0, &ocr);
-                if (!err) {
-                        if (mmc_attach_sdio(host, ocr))
-                                mmc_power_off(host);
-                        goto out;
-                }
+        mmc_power_up(host);
+        mmc_go_idle(host);
 
-                /*
-                 * ...then normal SD...
-                 */
-                err = mmc_send_app_op_cond(host, 0, &ocr);
-                if (!err) {
-                        if (mmc_attach_sd(host, ocr))
-                                mmc_power_off(host);
-                        goto out;
-                }
+        mmc_send_if_cond(host, host->ocr_avail);
 
-                /*
-                 * ...and finally MMC.
-                 */
-                err = mmc_send_op_cond(host, 0, &ocr);
-                if (!err) {
-                        if (mmc_attach_mmc(host, ocr))
-                                mmc_power_off(host);
-                        goto out;
-                }
+        /*
+         * First we search for SDIO...
+         */
+        err = mmc_send_io_op_cond(host, 0, &ocr);
+        if (!err) {
+                if (mmc_attach_sdio(host, ocr))
+                        mmc_power_off(host);
+                goto out;
+        }
 
-                mmc_release_host(host);
-                mmc_power_off(host);
-        } else {
-                if (host->bus_ops->detect && !host->bus_dead)
-                        host->bus_ops->detect(host);
+        /*
+         * ...then normal SD...
+         */
+        err = mmc_send_app_op_cond(host, 0, &ocr);
+        if (!err) {
+                if (mmc_attach_sd(host, ocr))
+                        mmc_power_off(host);
+                goto out;
+        }
 
-                mmc_bus_put(host);
+        /*
+         * ...and finally MMC.
+         */
+        err = mmc_send_op_cond(host, 0, &ocr);
+        if (!err) {
+                if (mmc_attach_mmc(host, ocr))
+                        mmc_power_off(host);
+                goto out;
         }
+
+        mmc_release_host(host);
+        mmc_power_off(host);
+
 out:
         if (host->caps & MMC_CAP_NEEDS_POLL)
                 mmc_schedule_delayed_work(&host->detect, HZ);