tgafb: actually allocate memory for the pseudo_palette

No memory allocation was done for the pseudo_palette.  Allocate one for it.

Signed-off-by: Antonino Daplas <[email protected]>
Acked-by: "Maciej W. Rozycki" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index 5c0dab62809972b2b28bc3bd1929e8994e915cae..89facb73edfcfff079ece1b6ce0aa140efd4b697 100644 (file)
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -1634,7 +1634,7 @@ tgafb_register(struct device *dev)
                      FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_FILLRECT;
        info->fbops = &tgafb_ops;
        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.  */
        if (tga_bus_pci) {

diff --git a/include/video/tgafb.h b/include/video/tgafb.h
index 03d0dbe293a8718902663f2ec190b545c4e6dae8..7bc5e2c1482617fd185c74fb8d78ded3abc69abd 100644 (file)
--- a/include/video/tgafb.h
+++ b/include/video/tgafb.h
@@ -216,6 +216,7 @@ struct tga_par {
        u32 pll_freq;                   /* pixclock in mhz */
        u32 bits_per_pixel;             /* bits per pixel */
        u32 sync_on_green;              /* set if sync is on green */
+       u32 palette[16];
 };