]> git.sur5r.net Git - u-boot/commitdiff
mmc: matsushita-common: Add missing else
authorMarek Vasut <marek.vasut+renesas@gmail.com>
Mon, 9 Apr 2018 23:44:23 +0000 (01:44 +0200)
committerMarek Vasut <marek.vasut+renesas@gmail.com>
Wed, 11 Apr 2018 21:12:00 +0000 (23:12 +0200)
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@gmail.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
drivers/mmc/matsushita-common.c

index 33224bb51b8116d70e1e74603995ae8416a2c4ef..e22a9de5daa4c9ad0fbd731372a26a881846c47a 100644 (file)
@@ -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 ||