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

Commit f9e5de0f authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: xgifb: eliminate string comparison from mode search 



Eliminate string comparison from the video mode search.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f47f12d6

drivers/staging/xgifb/XGI_main_26.c

+17 −10
Original line number Diff line number Diff line
@@ -390,18 +390,25 @@ static int XGIfb_GetXG21DefaultLVDSModeIdx(struct xgifb_video_info *xgifb_info) 
static void XGIfb_search_mode(struct xgifb_video_info *xgifb_info,

			      const char *name)

{

	int i = 0, j = 0, l;

	unsigned int xres;

	unsigned int yres;

	unsigned int bpp;

	int i;



	while (XGIbios_mode[i].mode_no != 0) {

		l = min(strlen(name), strlen(XGIbios_mode[i].name));

		if (!strncmp(name, XGIbios_mode[i].name, l)) {

	if (sscanf(name, "%ux%ux%u", &xres, &yres, &bpp) != 3)

		goto invalid_mode;



	if (bpp == 24)

		bpp = 32; /* That's for people who mix up color and fb depth. */



	for (i = 0; XGIbios_mode[i].mode_no != 0; i++)

		if (XGIbios_mode[i].xres == xres &&

		    XGIbios_mode[i].yres == yres &&

		    XGIbios_mode[i].bpp == bpp) {

			xgifb_info->mode_idx = i;

			j = 1;

			break;

		}

		i++;

			return;

		}

	if (!j)

invalid_mode:

	pr_info("Invalid mode '%s'\n", name);

}