Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[firefly-linux-kernel-4.4.55.git] / drivers / platform / x86 / acer-wmi.c

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index c91f69b39db4b8c637d5182eb5f8f85aed1bf79b..bbf78b2d6d93f9f020729e3dd07ff210cb048404 100644 (file)
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -570,6 +570,14 @@ static const struct dmi_system_id video_vendor_dmi_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5750"),
                },
        },
+       {
+               .callback = video_set_backlight_video_vendor,
+               .ident = "Acer Aspire 5741",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5741"),
+               },
+       },
        {}
 };
 
@@ -2228,7 +2236,7 @@ static int __init acer_wmi_init(void)
                pr_info("Brightness must be controlled by acpi video driver\n");
        } else {
                pr_info("Disabling ACPI video driver\n");
-               acpi_video_unregister();
+               acpi_video_unregister_backlight();
        }
 
        if (wmi_has_guid(WMID_GUID3)) {