Commit 6ba7843b authored by Armin Wolf's avatar Armin Wolf Committed by Hans de Goede
Browse files

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



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: 58f6425e ("WMI: Cater for multiple events with same GUID")
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240103192707.115512-2-W_Armin@gmx.de


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 6613476e

drivers/platform/x86/wmi.c

+9 −5
Original line number Diff line number Diff line
@@ -593,9 +593,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;

		}

	}
@@ -631,10 +632,13 @@ acpi_status wmi_remove_notify_handler(const char *guid) 
				return AE_NULL_ENTRY;



			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;

		}

	}