Commit 51391caf authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Darren Hart (VMware)

platform/x86: dell-wmi: Fix driver interface version query

When I converted dell-wmi to the new bus infrastructure, I left the
call to dell_wmi_check_descriptor_buffer() in dell_wmi_init().  This
could cause two problems:

 - An error message when loading the driver on a system without
   dell-wmi.  We'd try to read the event descriptor even if the WMI
   GUID wasn't there.

 - A possible race if dell-wmi was loaded manually before wmi was
   fully initialized.

Fix it by moving the call to the probe function where it belongs.

Fixes: bff589be ("platform/x86: dell-wmi: Convert to the WMI bus infrastructure")
Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Reviewed-by: default avatarPali Rohár <pali.rohar@gmail.com>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 97277717
...@@ -626,7 +626,7 @@ static void dell_wmi_input_destroy(struct wmi_device *wdev) ...@@ -626,7 +626,7 @@ static void dell_wmi_input_destroy(struct wmi_device *wdev)
* WMI Interface Version 8 4 <version> * WMI Interface Version 8 4 <version>
* WMI buffer length 12 4 4096 * WMI buffer length 12 4 4096
*/ */
static int __init dell_wmi_check_descriptor_buffer(void) static int dell_wmi_check_descriptor_buffer(void)
{ {
struct acpi_buffer out = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer out = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object *obj; union acpi_object *obj;
...@@ -717,9 +717,15 @@ static int dell_wmi_events_set_enabled(bool enable) ...@@ -717,9 +717,15 @@ static int dell_wmi_events_set_enabled(bool enable)
static int dell_wmi_probe(struct wmi_device *wdev) static int dell_wmi_probe(struct wmi_device *wdev)
{ {
int err;
struct dell_wmi_priv *priv = devm_kzalloc( struct dell_wmi_priv *priv = devm_kzalloc(
&wdev->dev, sizeof(struct dell_wmi_priv), GFP_KERNEL); &wdev->dev, sizeof(struct dell_wmi_priv), GFP_KERNEL);
err = dell_wmi_check_descriptor_buffer();
if (err)
return err;
dev_set_drvdata(&wdev->dev, priv); dev_set_drvdata(&wdev->dev, priv);
return dell_wmi_input_setup(wdev); return dell_wmi_input_setup(wdev);
...@@ -749,10 +755,6 @@ static int __init dell_wmi_init(void) ...@@ -749,10 +755,6 @@ static int __init dell_wmi_init(void)
{ {
int err; int err;
err = dell_wmi_check_descriptor_buffer();
if (err)
return err;
dmi_check_system(dell_wmi_smbios_list); dmi_check_system(dell_wmi_smbios_list);
if (wmi_requires_smbios_request) { if (wmi_requires_smbios_request) {
......
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