From: Yue Hu <huyue2@yulong.com>
Date: Thu, 4 Jun 2020 10:01:02 +0000 (+0800)
Subject: mmc: sdio: Return ret if sdio_disable_func() fails
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=42a166d7e05452c9af44d65cc14725a181b0569f;p=linux.git

mmc: sdio: Return ret if sdio_disable_func() fails

We should return any possible error returned by mmc_io_rw_direct()
rather than only -EIO in sdio_disable_func() failure path.

Signed-off-by: Yue Hu <huyue2@yulong.com>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20200604100102.13572-1-zbestahu@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c
index 2ba00acf64e64..cba54dfb04f78 100644
--- a/drivers/mmc/core/sdio_io.c
+++ b/drivers/mmc/core/sdio_io.c
@@ -133,7 +133,7 @@ int sdio_disable_func(struct sdio_func *func)
 
 err:
 	pr_debug("SDIO: Failed to disable device %s\n", sdio_func_id(func));
-	return -EIO;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(sdio_disable_func);