summaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/XGI_main_26.c
diff options
context:
space:
mode:
authorAaro Koskinen2011-10-11 20:47:24 +0200
committerGreg Kroah-Hartman2011-10-12 17:51:46 +0200
commit76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791 (patch)
tree969aee67e86ab8bfd4e13d4e27c26b997f83616c /drivers/staging/xgifb/XGI_main_26.c
parentstaging: xgifb: move XGIfb_rate_idx into xgifb_video_info (diff)
downloadkernel-qcow2-linux-76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791.tar.gz
kernel-qcow2-linux-76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791.tar.xz
kernel-qcow2-linux-76cabaa42800ac3dd3d64e60fa3a18c1dfcbf791.zip
staging: xgifb: move pseudo_palette into xgifb_video_info
pseudo_palette should be dynamically allocated for each fb. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb/XGI_main_26.c')
-rw-r--r--drivers/staging/xgifb/XGI_main_26.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index e89299c4ce69..45427d720274 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -2390,7 +2390,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
fb_info->screen_base = xgifb_info->video_vbase;
fb_info->fbops = &XGIfb_ops;
XGIfb_get_fix(&fb_info->fix, -1, fb_info);
- fb_info->pseudo_palette = pseudo_palette;
+ fb_info->pseudo_palette = xgifb_info->pseudo_palette;
fb_alloc_cmap(&fb_info->cmap, 256 , 0);