Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / drivers / mmc / host / cb710-mmc.c

diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c
index 7a176b4..66b4ce5 100644 (file)
--- a/drivers/mmc/host/cb710-mmc.c
+++ b/drivers/mmc/host/cb710-mmc.c
@@ -102,8 +102,6 @@ static void cb710_mmc_reset_events(struct cb710_slot *slot)
 
 static void cb710_mmc_enable_4bit_data(struct cb710_slot *slot, int enable)
 {
-       dev_dbg(cb710_slot_dev(slot), "configuring %d-data-line%s mode\n",
-               enable ? 4 : 1, enable ? "s" : "");
        if (enable)
                cb710_modify_port_8(slot, CB710_MMC_CONFIG1_PORT,
                        CB710_MMC_C1_4BIT_DATA_BUS, 0);
@@ -495,7 +493,6 @@ static void cb710_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
        if (!cb710_mmc_command(mmc, mrq->cmd) && mrq->stop)
                cb710_mmc_command(mmc, mrq->stop);
-       mdelay(1);
 
        tasklet_schedule(&reader->finish_req_tasklet);
 }
@@ -744,6 +741,7 @@ static int __devinit cb710_mmc_init(struct platform_device *pdev)
 err_free_mmc:
        dev_dbg(cb710_slot_dev(slot), "mmc_add_host() failed: %d\n", err);
 
+       cb710_set_irq_handler(slot, NULL);
        mmc_free_host(mmc);
        return err;
 }