summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-08 11:52:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-08 11:52:24 -0800
commitd32da5841b0f8b73dddb35c59c447d9749a47f6c (patch)
tree2d010e914b361be23eb3020dd8e388c86afd4824 /drivers
parent29f7e499413aab1d33a5313147d2f7e026f67d7c (diff)
parent98b8e4e5c17bf87c1b18ed929472051dab39878c (diff)
downloadlinux-d32da5841b0f8b73dddb35c59c447d9749a47f6c.tar.bz2
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/wmi.c2
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);