From ab43108d0dd48d287e1b5bb9cd4a969457ed9b0e Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Tue, 24 Nov 2020 12:15:28 +0000 Subject: drm/mcde: fix masking and bitwise-or on variable val The masking of val with ~MCDE_CRX1_CLKSEL_MASK is currently being ignored because there seems to be a missing bitwise-or of val in the following statement. Fix this by replacing the assignment of val with a bitwise-or. Fixes: d795fd322063 ("drm/mcde: Support DPI output") Signed-off-by: Colin Ian King Addresses-Coverity: ("Unused valued") Signed-off-by: Linus Walleij Link: https://patchwork.freedesktop.org/patch/msgid/20201124121528.395681-1-colin.king@canonical.com --- drivers/gpu/drm/mcde/mcde_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/drm/mcde') diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/mcde_display.c index d941026b940c..7c2e0b865441 100644 --- a/drivers/gpu/drm/mcde/mcde_display.c +++ b/drivers/gpu/drm/mcde/mcde_display.c @@ -738,7 +738,7 @@ static void mcde_configure_fifo(struct mcde *mcde, enum mcde_fifo fifo, } else { /* Use the MCDE clock for DSI */ val &= ~MCDE_CRX1_CLKSEL_MASK; - val = MCDE_CRX1_CLKSEL_MCDECLK << MCDE_CRX1_CLKSEL_SHIFT; + val |= MCDE_CRX1_CLKSEL_MCDECLK << MCDE_CRX1_CLKSEL_SHIFT; } writel(val, mcde->regs + cr1); spin_unlock(&mcde->fifo_crx1_lock); -- cgit v1.2.3