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

Commit b4a49b12 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds
Browse files

tdfxfb: fix frame buffer name overrun 



If there are more then one graphics card handled by the tdfxfb driver the
name of the frame buffer overruns reserved size.

Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bf6910c0

drivers/video/tdfxfb.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ static inline int mtrr_del(int reg, unsigned long base, 
#define VOODOO5_MAX_PIXCLOCK 350000

#define VOODOO5_MAX_PIXCLOCK 350000





static struct fb_fix_screeninfo tdfx_fix __devinitdata = {

static struct fb_fix_screeninfo tdfx_fix __devinitdata = {

	.id =		"3Dfx",

	.type =		FB_TYPE_PACKED_PIXELS,

	.type =		FB_TYPE_PACKED_PIXELS,

	.visual =	FB_VISUAL_PSEUDOCOLOR,

	.visual =	FB_VISUAL_PSEUDOCOLOR,

	.ypanstep =	1,

	.ypanstep =	1,
@@ -1200,15 +1199,15 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev, 
	/* Configure the default fb_fix_screeninfo first */

	/* Configure the default fb_fix_screeninfo first */

	switch (pdev->device) {

	switch (pdev->device) {

	case PCI_DEVICE_ID_3DFX_BANSHEE:

	case PCI_DEVICE_ID_3DFX_BANSHEE:

		strcat(tdfx_fix.id, " Banshee");

		strcpy(tdfx_fix.id, "3Dfx Banshee");

		default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK;

		default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK;

		break;

		break;

	case PCI_DEVICE_ID_3DFX_VOODOO3:

	case PCI_DEVICE_ID_3DFX_VOODOO3:

		strcat(tdfx_fix.id, " Voodoo3");

		strcpy(tdfx_fix.id, "3Dfx Voodoo3");

		default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK;

		default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK;

		break;

		break;

	case PCI_DEVICE_ID_3DFX_VOODOO5:

	case PCI_DEVICE_ID_3DFX_VOODOO5:

		strcat(tdfx_fix.id, " Voodoo5");

		strcpy(tdfx_fix.id, "3Dfx Voodoo5");

		default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK;

		default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK;

		break;

		break;

	}

	}