diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2007-07-17 04:05:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 10:23:12 -0700 |
| commit | c771eba1fe7168d6f2cbc52efa55b3838bd05b05 (patch) | |
| tree | 34b35dd0d040efff157becd3c6229d4fdba6bf02 /drivers/video/fm2fb.c | |
| parent | 4a1b92793a0824d31f165fe3a97634dbb9a3ae18 (diff) | |
| download | linux-c771eba1fe7168d6f2cbc52efa55b3838bd05b05.tar.gz linux-c771eba1fe7168d6f2cbc52efa55b3838bd05b05.tar.bz2 linux-c771eba1fe7168d6f2cbc52efa55b3838bd05b05.zip | |
fm2fb: the pseudo_palette is only 16 elements long
The pseudo_palette is only 16 elements long.
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/fm2fb.c')
| -rw-r--r-- | drivers/video/fm2fb.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c index 70ff55b14596..6c91c61cdb63 100644 --- a/drivers/video/fm2fb.c +++ b/drivers/video/fm2fb.c @@ -195,13 +195,15 @@ static int fm2fb_blank(int blank, struct fb_info *info) static int fm2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info) { - if (regno > info->cmap.len) - return 1; - red >>= 8; - green >>= 8; - blue >>= 8; + if (regno < 16) { + red >>= 8; + green >>= 8; + blue >>= 8; + + ((u32*)(info->pseudo_palette))[regno] = (red << 16) | + (green << 8) | blue; + } - ((u32*)(info->pseudo_palette))[regno] = (red << 16) | (green << 8) | blue; return 0; } @@ -237,7 +239,7 @@ static int __devinit fm2fb_probe(struct zorro_dev *z, if (!zorro_request_device(z,"fm2fb")) return -ENXIO; - info = framebuffer_alloc(256 * sizeof(u32), &z->dev); + info = framebuffer_alloc(16 * sizeof(u32), &z->dev); if (!info) { zorro_release_device(z); return -ENOMEM; |