Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Krzysztof Helt and committed by
Linus Torvalds
b4a49b12 bf6910c0

+3 -4
+3 -4
drivers/video/tdfxfb.c
··· 95 95 #define VOODOO5_MAX_PIXCLOCK 350000 96 96 97 97 static struct fb_fix_screeninfo tdfx_fix __devinitdata = { 98 - .id = "3Dfx", 99 98 .type = FB_TYPE_PACKED_PIXELS, 100 99 .visual = FB_VISUAL_PSEUDOCOLOR, 101 100 .ypanstep = 1, ··· 1199 1200 /* Configure the default fb_fix_screeninfo first */ 1200 1201 switch (pdev->device) { 1201 1202 case PCI_DEVICE_ID_3DFX_BANSHEE: 1202 - strcat(tdfx_fix.id, " Banshee"); 1203 + strcpy(tdfx_fix.id, "3Dfx Banshee"); 1203 1204 default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK; 1204 1205 break; 1205 1206 case PCI_DEVICE_ID_3DFX_VOODOO3: 1206 - strcat(tdfx_fix.id, " Voodoo3"); 1207 + strcpy(tdfx_fix.id, "3Dfx Voodoo3"); 1207 1208 default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK; 1208 1209 break; 1209 1210 case PCI_DEVICE_ID_3DFX_VOODOO5: 1210 - strcat(tdfx_fix.id, " Voodoo5"); 1211 + strcpy(tdfx_fix.id, "3Dfx Voodoo5"); 1211 1212 default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK; 1212 1213 break; 1213 1214 }