From f323a246970dd24caca6d8c00d3ef9942c696d89 Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Wed, 30 Jan 2013 15:19:15 +0900 Subject: [PATCH] --- yaml --- r: 358731 b: refs/heads/master c: 0132267d659107616eb044777f1b0be55381129a h: refs/heads/master i: 358729: 69fb8d68eabbe6d0fb84a527b98106039316c980 358727: ff73763afcc8a5db96ea72a9adefa2a8c0c8d5bd v: v3 --- [refs] | 2 +- trunk/drivers/video/backlight/pwm_bl.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 372eb9d707a5..1fae6c964898 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d75c203effefa4f62ca4d30bf52bd9ec246717f +refs/heads/master: 0132267d659107616eb044777f1b0be55381129a diff --git a/trunk/drivers/video/backlight/pwm_bl.c b/trunk/drivers/video/backlight/pwm_bl.c index 069983ca49ff..4af6d1302f17 100644 --- a/trunk/drivers/video/backlight/pwm_bl.c +++ b/trunk/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)