The patch titled
fm2fb: the pseudo_palette is only 16 elements long
has been removed from the -mm tree. Its filename was
fm2fb-the-pseudo_palette-is-only-16-elements-long.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: fm2fb: the pseudo_palette is only 16 elements long
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>
The pseudo_palette is only 16 elements long.
Signed-off-by: Antonino Daplas <adaplas@xxxxxxxxx>
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/fm2fb.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff -puN drivers/video/fm2fb.c~fm2fb-the-pseudo_palette-is-only-16-elements-long drivers/video/fm2fb.c
--- a/drivers/video/fm2fb.c~fm2fb-the-pseudo_palette-is-only-16-elements-long
+++ a/drivers/video/fm2fb.c
@@ -195,13 +195,15 @@ static int fm2fb_blank(int blank, struct
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
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;
_
Patches currently in -mm which might be from adaplas@xxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
