]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
msi-wmi: Port to new backlight interface selection API
authorHans de Goede <hdegoede@redhat.com>
Tue, 16 Jun 2015 14:28:07 +0000 (16:28 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:12:20 +0000 (01:12 +0200)
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>
drivers/platform/x86/msi-wmi.c

index 6d2bac0c463cd41f17eef2e4cfe41e16cc4f2658..978e6d6405729cb32391f73c65ac23a1b0eeebef 100644 (file)
@@ -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");