Commit eb3daa83 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds

tgafb: actually allocate memory for the pseudo_palette

No memory allocation was done for the pseudo_palette.  Allocate one for it.
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Acked-by: default avatar"Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9965f5b1
...@@ -1634,7 +1634,7 @@ tgafb_register(struct device *dev) ...@@ -1634,7 +1634,7 @@ tgafb_register(struct device *dev)
FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_FILLRECT; FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_FILLRECT;
info->fbops = &tgafb_ops; info->fbops = &tgafb_ops;
info->screen_base = par->tga_fb_base; info->screen_base = par->tga_fb_base;
info->pseudo_palette = (void *)(par + 1); info->pseudo_palette = par->palette;
/* This should give a reasonable default video mode. */ /* This should give a reasonable default video mode. */
if (tga_bus_pci) { if (tga_bus_pci) {
......
...@@ -216,6 +216,7 @@ struct tga_par { ...@@ -216,6 +216,7 @@ struct tga_par {
u32 pll_freq; /* pixclock in mhz */ u32 pll_freq; /* pixclock in mhz */
u32 bits_per_pixel; /* bits per pixel */ u32 bits_per_pixel; /* bits per pixel */
u32 sync_on_green; /* set if sync is on green */ u32 sync_on_green; /* set if sync is on green */
u32 palette[16];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment