From eb3daa83c2f63743fb7597f620beac75e1ba5633 Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Tue, 17 Jul 2007 04:05:41 -0700 Subject: [PATCH] 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 Acked-by: "Maciej W. Rozycki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/tgafb.c | 2 +- include/video/tgafb.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c index 5c0dab628099..89facb73edfc 100644 --- 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 03d0dbe293a8..7bc5e2c14826 100644 --- 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]; };