diff mbox

fbdev: avoid int-in-bool-context warning

Message ID 20170511124717.179251-1-arnd@arndb.de
State Accepted
Commit c544ad18bd47ee989eb433f09b6574a7f6d415c7
Headers show

Commit Message

Arnd Bergmann May 11, 2017, 12:47 p.m. UTC
gcc-7 suspects this code might be wrong because we use the
result of a multiplication as a bool:

drivers/video/fbdev/core/fbmon.c: In function 'fb_edid_add_monspecs':
drivers/video/fbdev/core/fbmon.c:1051:84: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]

It's actually fine, so let's add a comparison to zero to make
that clear to the compiler too.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/video/fbdev/core/fbmon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.0

Comments

Bartlomiej Zolnierkiewicz June 14, 2017, 10:04 a.m. UTC | #1
On Thursday, May 11, 2017 02:47:01 PM Arnd Bergmann wrote:
> gcc-7 suspects this code might be wrong because we use the

> result of a multiplication as a bool:

> 

> drivers/video/fbdev/core/fbmon.c: In function 'fb_edid_add_monspecs':

> drivers/video/fbdev/core/fbmon.c:1051:84: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]

> 

> It's actually fine, so let's add a comparison to zero to make

> that clear to the compiler too.

> 

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Patch queued for 4.12, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
diff mbox

Patch

diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index eaa6bab21839..99e45a49e435 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -1048,7 +1048,7 @@  void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
 
 	for (i = 0; i < (128 - edid[2]) / DETAILED_TIMING_DESCRIPTION_SIZE;
 	     i++, block += DETAILED_TIMING_DESCRIPTION_SIZE)
-		if (PIXEL_CLOCK)
+		if (PIXEL_CLOCK != 0)
 			edt[num++] = block - edid;
 
 	/* Yikes, EDID data is totally useless */