diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2006-06-26 00:26:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 09:58:30 -0700 |
| commit | 313ca22f0bfab792adeb447146d9cb86536c64d3 (patch) | |
| tree | 2a8855eec50beef14a6a4e4ea122cae3e16c9c4f /drivers/video/vesafb.c | |
| parent | f71689e4139a91c98cc476240aca40bd091d4538 (diff) | |
[PATCH] vesafb: Fix return code of vesafb_setcolreg
If the hardware palette cannot be accessed, make vesafb_setcolreg return a
nonzero value.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/vesafb.c')
| -rw-r--r-- | drivers/video/vesafb.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index 2fbaa8484f8..eff2ebcf1f7 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c @@ -80,10 +80,11 @@ static int vesafb_pan_display(struct fb_var_screeninfo *var, 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, unsigned red, unsigned green, "d" (regno), /* EDX */ "D" (&entry), /* EDI */ "S" (&pmi_pal)); /* ESI */ - return; + err = 0; } #endif @@ -110,18 +111,23 @@ static void vesa_setpalette(int regno, unsigned red, unsigned green, * 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 regno, unsigned red, unsigned green, 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 regno, unsigned red, unsigned green, } } - return 0; + return err; } static struct fb_ops vesafb_ops = { |