Commit d32da584 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'platform-drivers-x86-v4.15-4' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform driver fix from Darren Hart:
 "Address a wmi initcall ordering race resulting in a difficult to
  reproduce boot failure"

* tag 'platform-drivers-x86-v4.15-4' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: wmi: Call acpi_wmi_init() later
parents 29f7e499 98b8e4e5
...@@ -1458,5 +1458,5 @@ static void __exit acpi_wmi_exit(void) ...@@ -1458,5 +1458,5 @@ static void __exit acpi_wmi_exit(void)
class_unregister(&wmi_bus_class); class_unregister(&wmi_bus_class);
} }
subsys_initcall(acpi_wmi_init); subsys_initcall_sync(acpi_wmi_init);
module_exit(acpi_wmi_exit); module_exit(acpi_wmi_exit);
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