From f5867ef526002ce35230d443f9dfaab52efe0104 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Thu, 8 Nov 2012 17:35:29 +0900 Subject: [PATCH] --- yaml --- r: 336321 b: refs/heads/master c: bf7cb2244c80b1390c51dfc33a88b56ce88a8986 h: refs/heads/master i: 336319: bca3281621ff65c4dd8e7a9a59a4eeb6b9d3336c v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/dw_mmc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 79c5389cf99a..7219b046c38e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ccb52a00fd3fdea428e29816cbacb0a78090d474 +refs/heads/master: bf7cb2244c80b1390c51dfc33a88b56ce88a8986 diff --git a/trunk/drivers/mmc/host/dw_mmc.c b/trunk/drivers/mmc/host/dw_mmc.c index 6785d62ef047..fa8b14cce33a 100644 --- a/trunk/drivers/mmc/host/dw_mmc.c +++ b/trunk/drivers/mmc/host/dw_mmc.c @@ -683,9 +683,6 @@ static void __dw_mci_start_request(struct dw_mci *host, if (host->pdata->select_slot) host->pdata->select_slot(slot->id); - /* Slot specific timing and width adjustment */ - dw_mci_setup_bus(slot, false); - host->cur_slot = slot; host->mrq = mrq; @@ -812,6 +809,9 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (drv_data && drv_data->set_ios) drv_data->set_ios(slot->host, ios); + /* Slot specific timing and width adjustment */ + dw_mci_setup_bus(slot, false); + switch (ios->power_mode) { case MMC_POWER_UP: set_bit(DW_MMC_CARD_NEED_INIT, &slot->flags);