diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-23 21:15:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-23 21:15:05 -0500 |
| commit | be64c970f601d5bb439b6cc88ea2bd208b3422a0 (patch) | |
| tree | 8bf588711019bfef8fe111e2ac6283910ffe725e /drivers/platform/x86/acer-wmi.c | |
| parent | 34e3f91b4e66e52b3e189b2f778bd37d68963ca8 (diff) | |
| parent | b2cb9dcb98cc7a3210e9138a05e0ae1863523a61 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: Be in TS_POLLING state during mwait based C-state entry
ACPI: Fix regression where _PPC is not read at boot even when ignore_ppc=0
acer-wmi: Respect current backlight level when loading
Diffstat (limited to 'drivers/platform/x86/acer-wmi.c')
| -rw-r--r-- | drivers/platform/x86/acer-wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 07d14dfdf0b4..226b3e93498c 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
| @@ -934,7 +934,7 @@ static int __devinit acer_backlight_init(struct device *dev) | |||
| 934 | acer_backlight_device = bd; | 934 | acer_backlight_device = bd; |
| 935 | 935 | ||
| 936 | bd->props.power = FB_BLANK_UNBLANK; | 936 | bd->props.power = FB_BLANK_UNBLANK; |
| 937 | bd->props.brightness = max_brightness; | 937 | bd->props.brightness = read_brightness(bd); |
| 938 | bd->props.max_brightness = max_brightness; | 938 | bd->props.max_brightness = max_brightness; |
| 939 | backlight_update_status(bd); | 939 | backlight_update_status(bd); |
| 940 | return 0; | 940 | return 0; |