diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:22:16 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:22:16 +0100 |
| commit | cf8a1af855cfce135c31b84d29a7cb870638cdaa (patch) | |
| tree | 740f8cb0415983d114bd8280644046cd150d65a1 /drivers/acpi | |
| parent | 0faf996f4dd02a361158a705afcc31284d732276 (diff) | |
| parent | 906f187b93d4b15e54066802f2a3100ca4681296 (diff) | |
Merge branch 'acpi-video'
* acpi-video:
Revert "ACPI / video: Ignore BIOS initial backlight value for HP 250 G1"
ACPI / video: Quirk initial backlight level 0
ACPI / video: Fix initial level validity test
ACPI / blacklist: fix name of ThinkPad Edge E530
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/blacklist.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/video.c | 12 |
2 files changed, 3 insertions, 11 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index b7fd1aeb6c4..fb848378d58 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -304,7 +304,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { }, { .callback = dmi_disable_osi_win8, - .ident = "Lenovo ThinkPad Edge E530", + .ident = "ThinkPad Edge E530", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_PRODUCT_VERSION, "3259A2G"), diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 38c3a28d639..18dbdff4656 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -504,14 +504,6 @@ static struct dmi_system_id video_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion m4 Notebook PC"), }, }, - { - .callback = video_ignore_initial_backlight, - .ident = "HP 250 G1", - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"), - DMI_MATCH(DMI_PRODUCT_NAME, "HP 250 G1 Notebook PC"), - }, - }, {} }; @@ -856,9 +848,9 @@ acpi_video_init_brightness(struct acpi_video_device *device) * or an index). Set the backlight to max_level in this case. */ for (i = 2; i < br->count; i++) - if (level_old == br->levels[i]) + if (level == br->levels[i]) break; - if (i == br->count) + if (i == br->count || !level) level = max_level; } |