From: Hans de Goede Date: Thu, 14 Jan 2016 08:41:48 +0000 (+0100) Subject: ACPI / video: Revert "thinkpad_acpi: Use acpi_video_handles_brightness_key_presses()" X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95565f884137e5d38caaa674a6813d854713e801;p=linux-beck.git ACPI / video: Revert "thinkpad_acpi: Use acpi_video_handles_brightness_key_presses()" acpi_video_handles_brightness_key_presses()'s may return false if the i915 driver is not loaded yet when thinkpad_acpi loads, and then return true after the i915 driver has loaded. This means that thinkpad_acpi cannot use it as is since thinkpad_acpi caches the return value. This reverts commit 7714687a2b2d ("thinkpad_acpi: Use acpi_video_handles_brightness_key_presses()"). Fixes: 7714687a2b2d "thinkpad_acpi: Use acpi_video_handles_brightness_key_presses()" Signed-off-by: Hans de Goede Acked-by: Darren Hart Acked-by: Henrique de Moraes Holschuh Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index f453d5dc085e..0bed4733c4f0 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -3488,7 +3488,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) /* Do not issue duplicate brightness change events to * userspace. tpacpi_detect_brightness_capabilities() must have * been called before this point */ - if (acpi_video_handles_brightness_key_presses()) { + if (acpi_video_get_backlight_type() != acpi_backlight_vendor) { pr_info("This ThinkPad has standard ACPI backlight " "brightness control, supported by the ACPI " "video driver\n");