The patch titled
vesafb: Fix return code of vesafb_setcolreg
has been removed from the -mm tree. Its filename is
vesafb-fix-return-code-of-vesafb_setcolreg.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: vesafb: Fix return code of vesafb_setcolreg
From: "Antonino A. Daplas" <adaplas@xxxxxxxxx>
If the hardware palette cannot be accessed, make vesafb_setcolreg return a
nonzero value.
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/vesafb.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff -puN drivers/video/vesafb.c~vesafb-fix-return-code-of-vesafb_setcolreg drivers/video/vesafb.c
--- a/drivers/video/vesafb.c~vesafb-fix-return-code-of-vesafb_setcolreg
+++ a/drivers/video/vesafb.c
@@ -80,10 +80,11 @@ static int vesafb_pan_display(struct fb_
return 0;
}
-static void vesa_setpalette(int regno, unsigned red, unsigned green,
+static int vesa_setpalette(int regno, unsigned red, unsigned green,
unsigned blue)
{
int shift = 16 - depth;
+ int err = -EINVAL;
#ifdef __i386__
struct { u_char blue, green, red, pad; } entry;
@@ -102,7 +103,7 @@ static void vesa_setpalette(int regno, u
"d" (regno), /* EDX */
"D" (&entry), /* EDI */
"S" (&pmi_pal)); /* ESI */
- return;
+ err = 0;
}
#endif
@@ -110,18 +111,23 @@ static void vesa_setpalette(int regno, u
* without protected mode interface and if VGA compatible,
* try VGA registers...
*/
- if (vga_compat) {
+ if (err && vga_compat) {
outb_p(regno, dac_reg);
outb_p(red >> shift, dac_val);
outb_p(green >> shift, dac_val);
outb_p(blue >> shift, dac_val);
+ err = 0;
}
+
+ return err;
}
static int vesafb_setcolreg(unsigned regno, unsigned red, unsigned green,
unsigned blue, unsigned transp,
struct fb_info *info)
{
+ int err = 0;
+
/*
* Set a single color register. The values supplied are
* already rounded down to the hardware's capabilities
@@ -133,7 +139,7 @@ static int vesafb_setcolreg(unsigned reg
return 1;
if (info->var.bits_per_pixel == 8)
- vesa_setpalette(regno,red,green,blue);
+ err = vesa_setpalette(regno,red,green,blue);
else if (regno < 16) {
switch (info->var.bits_per_pixel) {
case 16:
@@ -164,7 +170,7 @@ static int vesafb_setcolreg(unsigned reg
}
}
- return 0;
+ return err;
}
static struct fb_ops vesafb_ops = {
_
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
