mmc: sdhci: fix __sdhci_adma_write_desc

Jisheng Zhang · storulf · commit 07be55b567a5 · 2018-10-08T11:40:43.000+02:00
If hosts provides ops-&gt;adma_write_desc, we should not fall back to the
general sdhci_adma_write_desc().

Signed-off-by: Jisheng Zhang &lt;Jisheng.Zhang@synaptics.com&gt;
Acked-by: Adrian Hunter &lt;adrian.hunter@intel.com&gt;
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
@@ -649,8 +649,8 @@ static inline void __sdhci_adma_write_desc(struct sdhci_host *host,
 {
 	if (host->ops->adma_write_desc)
 		host->ops->adma_write_desc(host, desc, addr, len, cmd);
-
-	sdhci_adma_write_desc(host, desc, addr, len, cmd);
+	else
+		sdhci_adma_write_desc(host, desc, addr, len, cmd);
 }
 
 static void sdhci_adma_mark_end(void *desc)

Original file line number	Diff line number	Diff line change
`@@ -649,8 +649,8 @@ static inline void __sdhci_adma_write_desc(struct sdhci_host *host,`
`649`	`649`	`{`
`650`	`650`	`if (host->ops->adma_write_desc)`
`651`	`651`	`host->ops->adma_write_desc(host, desc, addr, len, cmd);`
`652`		`-`
`653`		`- sdhci_adma_write_desc(host, desc, addr, len, cmd);`
	`652`	`+ else`
	`653`	`+ sdhci_adma_write_desc(host, desc, addr, len, cmd);`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`static void sdhci_adma_mark_end(void *desc)`