[PATCH] bcm43xx: Drain TX status before starting IRQs

[linux-2.6-omap-h63xx.git] / drivers / mmc / mmc.c

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 74eaaee66de0e59532ba5655fddac5aaeea5ba08..ee8863c123e37881e0f35ee658a15fd5e925ad31 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -996,7 +996,6 @@ static void mmc_read_scrs(struct mmc_host *host)
 
                mmc_set_data_timeout(&data, card, 0);
 
-               data.blksz_bits = 3;
                data.blksz = 1 << 3;
                data.blocks = 1;
                data.flags = MMC_DATA_READ;
@@ -1167,9 +1166,9 @@ static void mmc_setup(struct mmc_host *host)
 void mmc_detect_change(struct mmc_host *host, unsigned long delay)
 {
        if (delay)
-               schedule_delayed_work(&host->detect, delay);
+               mmc_schedule_delayed_work(&host->detect, delay);
        else
-               schedule_work(&host->detect);
+               mmc_schedule_work(&host->detect);
 }
 
 EXPORT_SYMBOL(mmc_detect_change);
@@ -1312,7 +1311,7 @@ EXPORT_SYMBOL(mmc_remove_host);
  */
 void mmc_free_host(struct mmc_host *host)
 {
-       flush_scheduled_work();
+       mmc_flush_scheduled_work();
        mmc_free_host_sysfs(host);
 }