korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

bus: ti-sysc: Fix dispc quirk masking bool variables

Browse Source 
[ Upstream commit f620596fa3 ]

Fix warning drivers/bus/ti-sysc.c:1806 sysc_quirk_dispc()
warn: masking a bool.

While at it let's add a comment for what were doing to make
the code a bit easier to follow.

Fixes: 7324a7a0d5 ("bus: ti-sysc: Implement display subsystem reset quirk")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/linux-omap/a8ec8a68-9c2c-4076-bf47-09fccce7659f@kili.mountain/
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Tony Lindgren 2023-05-17 10:04:16 +03:00 committed by Greg Kroah-Hartman
parent 6d07673027
commit 3752e6a98e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/bus/ti-sysc.c
View File

@ -1759,7 +1759,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,
if (!ddata->module_va) if (!ddata->module_va)
return -EIO; return -EIO;
/* DISP_CONTROL */ /* DISP_CONTROL, shut down lcd and digit on disable if enabled */
val = sysc_read(ddata, dispc_offset + 0x40); val = sysc_read(ddata, dispc_offset + 0x40);
lcd_en = val & lcd_en_mask; lcd_en = val & lcd_en_mask;
digit_en = val & digit_en_mask; digit_en = val & digit_en_mask;
@ -1771,7 +1771,7 @@ static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,
else else
irq_mask |= BIT(2) | BIT(3); /* EVSYNC bits */ irq_mask |= BIT(2) | BIT(3); /* EVSYNC bits */
} }
if (disable & (lcd_en | digit_en)) if (disable && (lcd_en || digit_en))
sysc_write(ddata, dispc_offset + 0x40, sysc_write(ddata, dispc_offset + 0x40,
val & ~(lcd_en_mask | digit_en_mask)); val & ~(lcd_en_mask | digit_en_mask));