projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'platform-drivers-x86-v4.2-1' of git://git.infradead.org/users/dvhart/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
platform
/
x86
/
toshiba_acpi.c
diff --git
a/drivers/platform/x86/toshiba_acpi.c
b/drivers/platform/x86/toshiba_acpi.c
index 58d611946b7b7d8fba2790360e9c48e8a093c5a1..3ad7b1fa24ce5459900c4b6c966b631c4b6ddc46 100644
(file)
--- a/
drivers/platform/x86/toshiba_acpi.c
+++ b/
drivers/platform/x86/toshiba_acpi.c
@@
-2523,14
+2523,11
@@
static int toshiba_acpi_setup_backlight(struct toshiba_acpi_dev *dev)
*/
if (dev->tr_backlight_supported ||
dmi_check_system(toshiba_vendor_backlight_dmi))
*/
if (dev->tr_backlight_supported ||
dmi_check_system(toshiba_vendor_backlight_dmi))
- acpi_video_
dmi_promote_vendor(
);
+ acpi_video_
set_dmi_backlight_type(acpi_backlight_vendor
);
- if (acpi_video_
backlight_support()
)
+ if (acpi_video_
get_backlight_type() != acpi_backlight_vendor
)
return 0;
return 0;
- /* acpi-video may have loaded before we called dmi_promote_vendor() */
- acpi_video_unregister_backlight();
-
memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_PLATFORM;
props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_PLATFORM;
props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;