diff options
| author | Matthew Garrett <mjg@redhat.com> | 2012-06-01 15:18:52 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2012-06-01 15:18:52 -0400 |
| commit | a2f01a899347fd97cb18094e5a55640cab552818 (patch) | |
| tree | 1800404cf4f08346a036f5d780530a87471bc47d /drivers | |
| parent | a6c2390cd6d2083d27a2359658e08f2d3df375ac (diff) | |
| download | linux-3.10-a2f01a899347fd97cb18094e5a55640cab552818.tar.gz linux-3.10-a2f01a899347fd97cb18094e5a55640cab552818.tar.bz2 linux-3.10-a2f01a899347fd97cb18094e5a55640cab552818.zip | |
apple-gmux: Fix up the suspend/resume patch
I incorporated the wrong version of the suspend/resume patch for gmux,
and so lost David Woodhouse's fix to leave the backlight level unchanged
over suspend/resume. This fixes it up to v2.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/apple-gmux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c index 6dcef4f199b..694a15a5623 100644 --- a/drivers/platform/x86/apple-gmux.c +++ b/drivers/platform/x86/apple-gmux.c @@ -88,7 +88,7 @@ static int gmux_update_status(struct backlight_device *bd) u32 brightness = bd->props.brightness; if (bd->props.state & BL_CORE_SUSPENDED) - brightness = 0; + return 0; /* * Older gmux versions require writing out lower bytes first then |