summaryrefslogtreecommitdiffstats
path: root/drivers/video/riva
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-03-23 00:10:01 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-23 11:01:22 -0700
commitcee9e8c5cb1554e9e85ad764d27b6c808555ed89 (patch)
treea0126f2dfe6217da329df802c6970f96a6330923 /drivers/video/riva
parent6149dd5cfaea9889060f2c039eaf45e2b39f7fb3 (diff)
downloadop-kernel-dev-cee9e8c5cb1554e9e85ad764d27b6c808555ed89.zip
op-kernel-dev-cee9e8c5cb1554e9e85ad764d27b6c808555ed89.tar.gz
[PATCH] rivafb: fix initial brightness
This is the rivafb equivalent of 238576e12fef1d52751c6e08db2d0bdb0e248caf. It fixes rivafb having a default backlight brightness of 0 (no picture at all) on a PBook 6,1. Signed-off-by: Guido Guenther <agx@sigxcpu.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Acked-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/riva')
-rw-r--r--drivers/video/riva/fbdev.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 1d1c7c6..d7ece8d 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -285,8 +285,6 @@ static const struct riva_regs reg_template = {
#define MAX_LEVEL 0x534
#define LEVEL_STEP ((MAX_LEVEL - MIN_LEVEL) / FB_BACKLIGHT_MAX)
-static struct backlight_properties riva_bl_data;
-
static int riva_bl_get_level_brightness(struct riva_par *par,
int level)
{
@@ -372,7 +370,7 @@ static void riva_bl_init(struct riva_par *par)
FB_BACKLIGHT_MAX);
bd->props.max_brightness = FB_BACKLIGHT_LEVELS - 1;
- bd->props.brightness = riva_bl_data.max_brightness;
+ bd->props.brightness = bd->props.max_brightness;
bd->props.power = FB_BLANK_UNBLANK;
backlight_update_status(bd);
OpenPOWER on IntegriCloud