[PATCH 16/24] tgafb: Actually allocate memory for the pseudo_palette

[PATCH 16/24] tgafb: Actually allocate memory for the pseudo_palette

[Antonino A. Daplas]

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

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
---

 drivers/video/tgafb.c |    2 +-
 include/video/tgafb.h |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c
index f0fde6e..5c9cd6e 100644
--- a/drivers/video/tgafb.c
+++ b/drivers/video/tgafb.c
@@ -1635,7 +1635,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 03d0dbe..7bc5e2c 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];
 };
 
 


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

Re: [PATCH 16/24] tgafb: Actually allocate memory for the pseudo_palette

[Maciej W. Rozycki]

On Sat, 2 Jun 2007, Antonino A. Daplas wrote:

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

 Indeed.  Thanks for debugging -- looks like a leftover from an earlier 
version of the changes I made which got forgotten later on.

  Maciej

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/