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

Commit f2c22605 authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/xgifb: Simplify XGI_GetRatePtrCRT2 



Since the smaller LCDRefreshIndex is contained identically in LCDARefreshIndex
we can simply use LCDARefreshIndex and skip the if/else.

Since LCDARefreshIndex is only used readonly and contains only small
unsigned values we also change its declaration to const u8.

In order to prevent an out-of-bounds access I changed the mask from 0x0F
to 0x07 and added a dummy value.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3de738cd

drivers/staging/xgifb/vb_setmode.c

+4 −12
Original line number Diff line number Diff line
@@ -5470,9 +5470,8 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, 
		unsigned short ModeNo, unsigned short ModeIdIndex,

		struct vb_device_info *pVBInfo)

{

	short LCDRefreshIndex[] = { 0x00, 0x00, 0x03, 0x01 },

			LCDARefreshIndex[] = { 0x00, 0x00, 0x03, 0x01, 0x01,

					0x01, 0x01 };

	const u8 LCDARefreshIndex[] = {

		0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x00 };



	unsigned short RefreshRateTableIndex, i, index, temp;
@@ -5489,15 +5488,8 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE, 
	if (pVBInfo->SetFlag & ProgrammingCRT2) {

		if (pVBInfo->VBInfo & (SetCRT2ToLCD | XGI_SetCRT2ToLCDA)) {

			if (pVBInfo->IF_DEF_LVDS == 0) {

				if (pVBInfo->VBType & (VB_SIS301B | VB_SIS302B

						| VB_SIS301LV | VB_SIS302LV

						| VB_XGI301C))

					/* 301b */

				temp = LCDARefreshIndex[

						pVBInfo->LCDResInfo & 0x0F];

				else

					temp = LCDRefreshIndex[

						pVBInfo->LCDResInfo & 0x0F];

					pVBInfo->LCDResInfo & 0x07];



				if (index > temp)

					index = temp;