platform/x86: wmi: Fix error handling in legacy WMI notify handler functions

[ Upstream commit 6ba7843b59b77360812617d071313c7f35f3757a ]

When wmi_install_notify_handler()/wmi_remove_notify_handler() are
unable to enable/disable the WMI device, they unconditionally return
an error to the caller.
When registering legacy WMI notify handlers, this means that the
callback remains registered despite wmi_install_notify_handler()
having returned an error.
When removing legacy WMI notify handlers, this means that the
callback is removed despite wmi_remove_notify_handler() having
returned an error.

Fix this by only warning when the WMI device could not be enabled.
This behaviour matches the bus-based WMI interface.

Tested on a Dell Inspiron 3505 and a Acer Aspire E1-731.

Fixes: 58f6425eb92f ("WMI: Cater for multiple events with same GUID")
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240103192707.115512-2-W_Armin@gmx.de
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 5dd22258cb3bc2b350331ce07431b8ecf6c45734..bd017478e61b64316e21341d1d6c4d4d85fcd84f 100644 (file)
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -686,9 +686,10 @@ acpi_status wmi_install_notify_handler(const char *guid,
                        block->handler_data = data;
 
                        wmi_status = wmi_method_enable(block, true);
-                       if ((wmi_status != AE_OK) ||
-                           ((wmi_status == AE_OK) && (status == AE_NOT_EXIST)))
-                               status = wmi_status;
+                       if (ACPI_FAILURE(wmi_status))
+                               dev_warn(&block->dev.dev, "Failed to enable device\n");
+
+                       status = AE_OK;
                }
        }
 
@@ -729,12 +730,13 @@ acpi_status wmi_remove_notify_handler(const char *guid)
                                status = AE_OK;
                        } else {
                                wmi_status = wmi_method_enable(block, false);
+                               if (ACPI_FAILURE(wmi_status))
+                                       dev_warn(&block->dev.dev, "Failed to disable device\n");
+
                                block->handler = NULL;
                                block->handler_data = NULL;
-                               if ((wmi_status != AE_OK) ||
-                                   ((wmi_status == AE_OK) &&
-                                    (status == AE_NOT_EXIST)))
-                                       status = wmi_status;
+
+                               status = AE_OK;
                        }
                }
        }