From 9a89c115506e5ad3dd73d9613cf6331d689d7da0 Mon Sep 17 00:00:00 2001 From: Jisheng Zhang Date: Mon, 17 Sep 2018 13:30:41 +0800 Subject: [PATCH] UPSTREAM: mmc: sdhci: fix __sdhci_adma_write_desc If hosts provides ops->adma_write_desc, we should not fall back to the general sdhci_adma_write_desc(). Change-Id: I42e14edddbf7eccecb18bbff2abd802ea8dacd43 Signed-off-by: Jisheng Zhang Acked-by: Adrian Hunter Signed-off-by: Ulf Hansson Signed-off-by: Shawn Lin (cherry picked from 07be55b567a556c7e4d421e5f4bb4248933bfe32) --- drivers/mmc/host/sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 7078dcaa3a44..db416e544e0f 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -581,8 +581,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)