]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
platform/x86: fujitsu-laptop: account for backlight power when determining brightness
authorMichał Kępień <kernel@kempniu.pl>
Wed, 5 Apr 2017 06:49:09 +0000 (08:49 +0200)
committerDarren Hart (VMware) <dvhart@infradead.org>
Thu, 13 Apr 2017 17:16:07 +0000 (10:16 -0700)
The comment for the get_brightness backlight device callback in
include/linux/backlight.h states that it should "return the current
backlight brightness (accounting for power, fb_blank etc.)".
fujitsu-laptop violates that premise by simply returning the value to
which ACPI function GBLL evaluates to.  Make sure 0 is returned when
backlight power is turned off.

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
drivers/platform/x86/fujitsu-laptop.c

index af36b15515ed25df343ddff90d55ee889bf71213..b881721340631c93dee1a8105d56a2f7fc939855 100644 (file)
@@ -423,7 +423,7 @@ static int get_max_brightness(void)
 
 static int bl_get_brightness(struct backlight_device *b)
 {
-       return get_lcd_level();
+       return b->props.power == FB_BLANK_POWERDOWN ? 0 : get_lcd_level();
 }
 
 static int bl_update_status(struct backlight_device *b)