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: bff589be59
("platform/x86: dell-wmi: Convert to the WMI bus infrastructure")
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
This commit is contained in:
Родитель
972777171f
Коммит
51391caf99
|
@ -626,7 +626,7 @@ static void dell_wmi_input_destroy(struct wmi_device *wdev)
|
|||
* WMI Interface Version 8 4 <version>
|
||||
* 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 };
|
||||
union acpi_object *obj;
|
||||
|
@ -717,9 +717,15 @@ static int dell_wmi_events_set_enabled(bool enable)
|
|||
|
||||
static int dell_wmi_probe(struct wmi_device *wdev)
|
||||
{
|
||||
int err;
|
||||
|
||||
struct dell_wmi_priv *priv = devm_kzalloc(
|
||||
&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);
|
||||
|
||||
return dell_wmi_input_setup(wdev);
|
||||
|
@ -749,10 +755,6 @@ static int __init dell_wmi_init(void)
|
|||
{
|
||||
int err;
|
||||
|
||||
err = dell_wmi_check_descriptor_buffer();
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
dmi_check_system(dell_wmi_smbios_list);
|
||||
|
||||
if (wmi_requires_smbios_request) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче