Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddaa8cc5 authored by Rustam Subkhankulov's avatar Rustam Subkhankulov Committed by Greg Kroah-Hartman
Browse files

video: fbdev: sis: fix typos in SiS_GetModeID() 



[ Upstream commit 3eb8fccc244bfb41a7961969e4db280d44911226 ]

The second operand of a '&&' operator has no impact on expression
result for cases 400 and 512 in SiS_GetModeID().

Judging by the logic and the names of the variables, in both cases a
typo was made.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: default avatarRustam Subkhankulov <subkhankulov@ispras.ru>
Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 49a4c1a8

drivers/video/fbdev/sis/init.c

+2 −2
Original line number Diff line number Diff line
@@ -355,12 +355,12 @@ SiS_GetModeID(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay, 
		}

		break;

	case 400:

		if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 800) && (LCDwidth >= 600))) {

		if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 800) && (LCDheight >= 600))) {

			if(VDisplay == 300) ModeIndex = ModeIndex_400x300[Depth];

		}

		break;

	case 512:

		if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 1024) && (LCDwidth >= 768))) {

		if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 1024) && (LCDheight >= 768))) {

			if(VDisplay == 384) ModeIndex = ModeIndex_512x384[Depth];

		}

		break;