From d0657b0af3788812f9756d75feb18525603c4655 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Thu, 19 Apr 2012 10:55:35 -0500 Subject: [PATCH] --- yaml --- r: 310141 b: refs/heads/master c: 96960880c31131ab906e7e0627ab89e8319c385e h: refs/heads/master i: 310139: 401a97b63eca3ca0a43594b95f7c8d1916ca1ed4 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/apple-gmux.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 68f88c1a0558..d309cedf75e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc7ab495c7532f06bc03021c0d78ac384fb13c14 +refs/heads/master: 96960880c31131ab906e7e0627ab89e8319c385e diff --git a/trunk/drivers/platform/x86/apple-gmux.c b/trunk/drivers/platform/x86/apple-gmux.c index 8a582bdfdc76..6dcef4f199bb 100644 --- a/trunk/drivers/platform/x86/apple-gmux.c +++ b/trunk/drivers/platform/x86/apple-gmux.c @@ -87,6 +87,9 @@ static int gmux_update_status(struct backlight_device *bd) struct apple_gmux_data *gmux_data = bl_get_data(bd); u32 brightness = bd->props.brightness; + if (bd->props.state & BL_CORE_SUSPENDED) + brightness = 0; + /* * Older gmux versions require writing out lower bytes first then * setting the upper byte to 0 to flush the values. Newer versions @@ -102,6 +105,7 @@ static int gmux_update_status(struct backlight_device *bd) } static const struct backlight_ops gmux_bl_ops = { + .options = BL_CORE_SUSPENDRESUME, .get_brightness = gmux_get_brightness, .update_status = gmux_update_status, };