From 6956eba1e39e9b674d4bdb4c5d42dd135b08d759 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 3 May 2005 12:23:56 +0100 Subject: [PATCH] --- yaml --- r: 815 b: refs/heads/master c: eca02b0c1dc1da374216128157747d8ed994e5ef h: refs/heads/master i: 813: d28de5d2bee145c6d104b80a43941f2ae7d2e8f5 811: b881e7499a6cd27bbd32ae98cd1df7a26eb8fcb5 807: 9e4be5984af493dbeb55b64e479f3d083379cfc3 799: f267d993491982106bf13a38125be304fb61af44 v: v3 --- [refs] | 2 +- trunk/drivers/video/cyber2000fb.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4263f086a8e4..d0e21f584f38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f9c381fa3e0b9b9042e310c69df87eaf9b46ea4 +refs/heads/master: eca02b0c1dc1da374216128157747d8ed994e5ef diff --git a/trunk/drivers/video/cyber2000fb.c b/trunk/drivers/video/cyber2000fb.c index 8b1b7c687a99..3894b2a501d6 100644 --- a/trunk/drivers/video/cyber2000fb.c +++ b/trunk/drivers/video/cyber2000fb.c @@ -90,6 +90,8 @@ struct cfb_info { */ u_char ramdac_ctrl; u_char ramdac_powerdown; + + u32 pseudo_palette[16]; }; static char *default_font = "Acorn8x8"; @@ -1223,9 +1225,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name) { struct cfb_info *cfb; - cfb = kmalloc(sizeof(struct cfb_info) + - sizeof(u32) * 16, GFP_KERNEL); - + cfb = kmalloc(sizeof(struct cfb_info), GFP_KERNEL); if (!cfb) return NULL; @@ -1281,7 +1281,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name) cfb->fb.fbops = &cyber2000fb_ops; cfb->fb.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN; - cfb->fb.pseudo_palette = (void *)(cfb + 1); + cfb->fb.pseudo_palette = cfb->pseudo_palette; fb_alloc_cmap(&cfb->fb.cmap, NR_PALETTE, 0);