From db877121c729c551839c9dead98c2c4b57cce5b0 Mon Sep 17 00:00:00 2001 From: Jonathan Kliegman Date: Thu, 14 Jun 2012 13:31:55 -0400 Subject: [PATCH] --- yaml --- r: 312811 b: refs/heads/master c: 3bfe619dc365e439936ed6dae36506944c44c18c h: refs/heads/master i: 312809: d323abf815ab6ad260bbac4a56c0d3ef0f7be6ca 312807: e7b7967cbd07f25013f754a9561d53846f30321e v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/dw_mmc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a67ce18fda3..b647ec324636 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e137788dd115dd9d21759a768dba5fff9685e587 +refs/heads/master: 3bfe619dc365e439936ed6dae36506944c44c18c diff --git a/trunk/drivers/mmc/host/dw_mmc.c b/trunk/drivers/mmc/host/dw_mmc.c index 5a600b3b3199..72dc3cde646d 100644 --- a/trunk/drivers/mmc/host/dw_mmc.c +++ b/trunk/drivers/mmc/host/dw_mmc.c @@ -2186,7 +2186,7 @@ int dw_mci_resume(struct dw_mci *host) return ret; } - if (host->dma_ops->init) + if (host->use_dma && host->dma_ops->init) host->dma_ops->init(host); /* Restore the old value at FIFOTH register */