From: Marek Vasut Date: Mon, 9 Apr 2018 23:44:23 +0000 (+0200) Subject: mmc: matsushita-common: Add missing else X-Git-Tag: v2018.05-rc2~18^2~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5ee7c9dc7777f9a0f8bb993ed36b48d4bf19f3d9;p=u-boot mmc: matsushita-common: Add missing else 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 Cc: Jaehoon Chung Cc: Masahiro Yamada --- 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 ||