aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2010-07-29 22:40:54 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-30 23:29:33 +0100
commite76df4d33973bd9b963d0cce05749b090cc14936 (patch)
treef36fb45132f66f44a52446d9113fcbcdcfd57c05
parent00b4703f03ce04bd7f2f912fd05a243096ab826f (diff)
downloadlinux-2.6.34-ux500-e76df4d33973bd9b963d0cce05749b090cc14936.tar.gz
cyber2000fb: fix console in truecolor modes
Return value was not set to 0 in setcolreg() with truecolor modes. This causes fb_set_cmap() to abort after first color, resulting in blank palette - and blank console in 24bpp and 32bpp modes. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--drivers/video/cyber2000fb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index 3eee8296513..0c1afd13ddd 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -388,6 +388,7 @@ cyber2000fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
pseudo_val |= convert_bitfield(red, &var->red);
pseudo_val |= convert_bitfield(green, &var->green);
pseudo_val |= convert_bitfield(blue, &var->blue);
+ ret = 0;
break;
}