]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
alienware-wmi: Fix X Series and G Series quirks
authorKurt Borja <kuurtb@gmail.com>
Sun, 8 Dec 2024 00:26:55 +0000 (21:26 -0300)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tue, 10 Dec 2024 14:22:52 +0000 (16:22 +0200)
Devices that are known to support the WMI thermal interface do not
support the legacy LED control interface. Make `.num_zones = 0` and
avoid calling alienware_zone_init() if that's the case.

Fixes: 9f6c43041552 ("alienware-wmi: added platform profile support")
Fixes: 1c1eb70e7d23 ("alienware-wmi: extends the list of supported models")
Suggested-by: Armin Wolf <W_Armin@gmx.de>
Reviewed-by: Armin Wolf <W_Armin@gmx.de>
Signed-off-by: Kurt Borja <kuurtb@gmail.com>
Link: https://lore.kernel.org/r/20241208002652.5885-4-kuurtb@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/dell/alienware-wmi.c

index 77465ed9b449bfa96c427ba781a1818235641c91..e69bf9a7b6c84e6884383d276661194c43622976 100644 (file)
@@ -190,7 +190,7 @@ static struct quirk_entry quirk_asm201 = {
 };
 
 static struct quirk_entry quirk_g_series = {
-       .num_zones = 2,
+       .num_zones = 0,
        .hdmi_mux = 0,
        .amplifier = 0,
        .deepslp = 0,
@@ -199,7 +199,7 @@ static struct quirk_entry quirk_g_series = {
 };
 
 static struct quirk_entry quirk_x_series = {
-       .num_zones = 2,
+       .num_zones = 0,
        .hdmi_mux = 0,
        .amplifier = 0,
        .deepslp = 0,
@@ -687,6 +687,9 @@ static void alienware_zone_exit(struct platform_device *dev)
 {
        u8 zone;
 
+       if (!quirks->num_zones)
+               return;
+
        sysfs_remove_group(&dev->dev.kobj, &zone_attribute_group);
        led_classdev_unregister(&global_led);
        if (zone_dev_attrs) {
@@ -1229,9 +1232,11 @@ static int __init alienware_wmi_init(void)
                        goto fail_prep_thermal_profile;
        }
 
-       ret = alienware_zone_init(platform_device);
-       if (ret)
-               goto fail_prep_zones;
+       if (quirks->num_zones > 0) {
+               ret = alienware_zone_init(platform_device);
+               if (ret)
+                       goto fail_prep_zones;
+       }
 
        return 0;