---

yaml --- r: 312811 b: refs/heads/master c: 3bfe619 h: refs/heads/master i: 312809: d323abf 312807: e7b7967 v: v3
git-mirror · Jul 21, 2012 · db87712 · db87712
1 parent d773532
commit db87712
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 */