[U-Boot] [PATCH 4/5] mmc: matsushita-common: Add missing else

Marek Vasut marek.vasut at gmail.com
Mon Apr 9 23:49:21 UTC 2018


Fix minor rebase omission, the else was missing which triggered
two accesses to the register on 64bit variant of the IP.

Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
Cc: Jaehoon Chung <jh80.chung at samsung.com>
Cc: Masahiro Yamada <yamada.masahiro at socionext.com>
---
 drivers/mmc/matsushita-common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/matsushita-common.c b/drivers/mmc/matsushita-common.c
index 33224bb51b..e22a9de5da 100644
--- a/drivers/mmc/matsushita-common.c
+++ b/drivers/mmc/matsushita-common.c
@@ -66,7 +66,7 @@ void matsu_sd_writel(struct matsu_sd_priv *priv,
 {
 	if (priv->caps & MATSU_SD_CAP_64BIT)
 		writel(val, priv->regbase + (reg << 1));
-	if (priv->caps & MATSU_SD_CAP_16BIT) {
+	else if (priv->caps & MATSU_SD_CAP_16BIT) {
 		writew(val & 0xffff, priv->regbase + (reg >> 1));
 		if (reg == MATSU_SD_INFO1 || reg == MATSU_SD_INFO1_MASK ||
 		    reg == MATSU_SD_INFO2 || reg == MATSU_SD_INFO2_MASK ||
-- 
2.16.2



More information about the U-Boot mailing list