projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a6c2390
)
apple-gmux: Fix up the suspend/resume patch
author
Matthew Garrett
<mjg@redhat.com>
Fri, 1 Jun 2012 19:18:52 +0000
(15:18 -0400)
committer
Matthew Garrett
<mjg@redhat.com>
Fri, 1 Jun 2012 19:18:52 +0000
(15:18 -0400)
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>
drivers/platform/x86/apple-gmux.c
patch
|
blob
|
history
diff --git
a/drivers/platform/x86/apple-gmux.c
b/drivers/platform/x86/apple-gmux.c
index
6dcef4f
..
694a15a
100644
(file)
--- 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