summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/msi-wmi.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-16 16:28:07 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:12:20 +0200
commit33a4edfba6bcc0482bf9013352c371816c6437c2 (patch)
treea9d1d8ee3530704b603bbd4330f0a5b52a5e1770 /drivers/platform/x86/msi-wmi.c
parent2cc6c717799f0ab3e8309fa9e43757f0c1906f14 (diff)
downloadop-kernel-dev-33a4edfba6bcc0482bf9013352c371816c6437c2.zip
op-kernel-dev-33a4edfba6bcc0482bf9013352c371816c6437c2.tar.gz
msi-wmi: Port to new backlight interface selection API
Port the backlight selection logic to the new backlight interface selection API. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/platform/x86/msi-wmi.c')
-rw-r--r--drivers/platform/x86/msi-wmi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
index 6d2bac0..978e6d6 100644
--- a/drivers/platform/x86/msi-wmi.c
+++ b/drivers/platform/x86/msi-wmi.c
@@ -29,6 +29,7 @@
#include <linux/backlight.h>
#include <linux/slab.h>
#include <linux/module.h>
+#include <acpi/video.h>
MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
MODULE_DESCRIPTION("MSI laptop WMI hotkeys driver");
@@ -320,7 +321,8 @@ static int __init msi_wmi_init(void)
break;
}
- if (wmi_has_guid(MSIWMI_BIOS_GUID) && !acpi_video_backlight_support()) {
+ if (wmi_has_guid(MSIWMI_BIOS_GUID) &&
+ acpi_video_get_backlight_type() == acpi_backlight_vendor) {
err = msi_wmi_backlight_setup();
if (err) {
pr_err("Unable to setup backlight device\n");
OpenPOWER on IntegriCloud