dell-wmi - do not keep driver loaded on unsupported boxes
Subsystems (2)
PATCH 1/1 dell-wmi - do not keep driver loaded on unsupported boxes
There is no point in having the driver loaded in memory if we fail to locate particular WMI GUID.
Signed-off-by Dmitry Torokhov <[email protected]>
---
drivers/platform/x86/dell-wmi.c | 41 ++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 22 deletions(-)
drivers/platform/x86/dell-wmi.c +19 -22
@@ -324,37 +324,34 @@ static int __init dell_wmi_init(void)int err;if (wmi_has_guid (DELL_EVENT_GUID )) { +printk (KERN_WARNING "dell-wmi: No known WMI GUID found\n" ); +return -ENODEV ; + } -dmi_walk (find_hk_type,NULL ); - - err =dell_wmi_input_setup (); - -if (err) -return err; - - err =wmi_install_notify_handler (DELL_EVENT_GUID , - dell_wmi_notify,NULL ); -if (err) { -input_unregister_device (dell_wmi_input_dev); -printk (KERN_ERR "dell-wmi: Unable to register" -" notify handler - %d\n" , err); -return err; - } +dmi_walk (find_hk_type,NULL ); + acpi_video =acpi_video_backlight_support (); - acpi_video =acpi_video_backlight_support (); + err =dell_wmi_input_setup (); +if (err) +return err; - }else -printk (KERN_WARNING "dell-wmi: No known WMI GUID found\n" ); + err =wmi_install_notify_handler (DELL_EVENT_GUID , + dell_wmi_notify,NULL ); +if (err) { +input_unregister_device (dell_wmi_input_dev); +printk (KERN_ERR +"dell-wmi: Unable to register notify handler - %d\n" , + err); +return err; + }return 0 ; } static void __exit dell_wmi_exit(void) { -if (wmi_has_guid (DELL_EVENT_GUID )) { -wmi_remove_notify_handler (DELL_EVENT_GUID ); -input_unregister_device (dell_wmi_input_dev); - } +wmi_remove_notify_handler (DELL_EVENT_GUID ); +input_unregister_device (dell_wmi_input_dev); }module_init (dell_wmi_init);
Signature · 1 line
Dmitry
Quoted 4 lines · Dmitry Torokhov
There is no point in having the driver loaded in memory if we fail to locate particular WMI GUID.
Signed-off-by Dmitry Torokhov <[email protected]>
Acked-by Matthew Garrett <[email protected]>
Signature · 1 line
Matthew Garrett | [email protected]
applied
thanks,
Len Brown, Intel Open Source Technology Center