From cf95cff3c8ea06a0bac0408d1b37ff91e3a133fa Mon Sep 17 00:00:00 2001 From: Chris Ball Date: Sat, 24 Dec 2011 21:06:06 -0500 Subject: [PATCH] --- yaml --- r: 284502 b: refs/heads/master c: 5b93a4595b6c39f78b69cc6eb9a3fa0ae6efe4a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/dw_mmc.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d9363c713d33..f92921eef053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f408cc67a0613f969d1e02fff6de74d31a29fb3 +refs/heads/master: 5b93a4595b6c39f78b69cc6eb9a3fa0ae6efe4a6 diff --git a/trunk/drivers/mmc/host/dw_mmc.c b/trunk/drivers/mmc/host/dw_mmc.c index 69e588960e79..9b839fabfb3c 100644 --- a/trunk/drivers/mmc/host/dw_mmc.c +++ b/trunk/drivers/mmc/host/dw_mmc.c @@ -1678,14 +1678,9 @@ static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) if (host->pdata->caps) mmc->caps = host->pdata->caps; - else - mmc->caps = 0; if (host->pdata->caps2) mmc->caps2 = host->pdata->caps2; - else - mmc->caps2 = 0; - if (host->pdata->get_bus_wd) if (host->pdata->get_bus_wd(slot->id) >= 4)