diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-08 11:52:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-08 11:52:24 -0800 |
| commit | d32da5841b0f8b73dddb35c59c447d9749a47f6c (patch) | |
| tree | 2d010e914b361be23eb3020dd8e388c86afd4824 | |
| parent | Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup (diff) | |
| parent | platform/x86: wmi: Call acpi_wmi_init() later (diff) | |
| download | wireguard-linux-d32da5841b0f8b73dddb35c59c447d9749a47f6c.tar.xz wireguard-linux-d32da5841b0f8b73dddb35c59c447d9749a47f6c.zip | |
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
| -rw-r--r-- | drivers/platform/x86/wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 791449a2370f..daa68acbc900 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -1458,5 +1458,5 @@ static void __exit acpi_wmi_exit(void) class_unregister(&wmi_bus_class); } -subsys_initcall(acpi_wmi_init); +subsys_initcall_sync(acpi_wmi_init); module_exit(acpi_wmi_exit); |