diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2018-04-10 01:44:23 +0200 |
|---|---|---|
| committer | Marek Vasut <marek.vasut+renesas@gmail.com> | 2018-04-11 23:12:00 +0200 |
| commit | 5ee7c9dc7777f9a0f8bb993ed36b48d4bf19f3d9 (patch) | |
| tree | c389d4cb1f7b51f5a07651cea9c1a15b32e66668 /drivers | |
| parent | f23b208ebe6a8e241b3801ccfbb2c49e680fad9b (diff) | |
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 <marek.vasut+renesas@gmail.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/matsushita-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 || |