Commit 3d8a29fe authored by Armin Wolf's avatar Armin Wolf Committed by Hans de Goede

platform/x86: wmi: Return immediately if an suitable WMI event is found

Commit 58f6425e ("WMI: Cater for multiple events with same GUID")
allowed legacy WMI notify handlers to be installed for multiple WMI
devices with the same GUID.
However this is useless since the legacy GUID-based interface is
blacklisted from seeing WMI devices with duplicated GUIDs.

Return immediately if a suitable WMI event is found in
wmi_install/remove_notify_handler() since searching for other suitable
events is pointless.

Tested on a Dell Inspiron 3505 and a Acer Aspire E1-731.
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-3-W_Armin@gmx.deSigned-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 6ba7843b
......@@ -573,7 +573,6 @@ acpi_status wmi_install_notify_handler(const char *guid,
void *data)
{
struct wmi_block *block;
acpi_status status = AE_NOT_EXIST;
guid_t guid_input;
if (!guid || !handler)
......@@ -596,11 +595,11 @@ acpi_status wmi_install_notify_handler(const char *guid,
if (ACPI_FAILURE(wmi_status))
dev_warn(&block->dev.dev, "Failed to enable device\n");
status = AE_OK;
return AE_OK;
}
}
return status;
return AE_NOT_EXIST;
}
EXPORT_SYMBOL_GPL(wmi_install_notify_handler);
......@@ -615,7 +614,6 @@ EXPORT_SYMBOL_GPL(wmi_install_notify_handler);
acpi_status wmi_remove_notify_handler(const char *guid)
{
struct wmi_block *block;
acpi_status status = AE_NOT_EXIST;
guid_t guid_input;
if (!guid)
......@@ -638,11 +636,11 @@ acpi_status wmi_remove_notify_handler(const char *guid)
block->handler = NULL;
block->handler_data = NULL;
status = AE_OK;
return AE_OK;
}
}
return status;
return AE_NOT_EXIST;
}
EXPORT_SYMBOL_GPL(wmi_remove_notify_handler);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment