From: Alexandre Courbot Date: Wed, 30 Jan 2013 06:19:15 +0000 (+0900) Subject: pwm-backlight: handle BL_CORE_FBBLANK state X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0132267d659107616eb044777f1b0be55381129a;p=deliverable%2Flinux.git pwm-backlight: handle BL_CORE_FBBLANK state According to include/linux/backlight.h, the fb_blank field is to be removed and blank status should preferably be set by setting the BL_CORE_FBBLANK bit of the state field. This patch ensures this condition is also taken into account when updating the backlight state. Signed-off-by: Alexandre Courbot Signed-off-by: Thierry Reding --- diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index 069983ca49ff..4af6d1302f17 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -41,10 +41,9 @@ static int pwm_backlight_update_status(struct backlight_device *bl) int brightness = bl->props.brightness; int max = bl->props.max_brightness; - if (bl->props.power != FB_BLANK_UNBLANK) - brightness = 0; - - if (bl->props.fb_blank != FB_BLANK_UNBLANK) + if (bl->props.power != FB_BLANK_UNBLANK || + bl->props.fb_blank != FB_BLANK_UNBLANK || + bl->props.state & BL_CORE_FBBLANK) brightness = 0; if (pb->notify)