summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-14 12:45:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-14 12:45:36 -0800
commit894554c1ca793ad96a26b7c9f1eedd043e9e8164 (patch)
tree510c4eb35d5986414a763e30012eeb5954174723 /drivers
parentaff2a52507bfeb4d44d6a69f6f8d7ca3bcb9b50d (diff)
parenteecd37e105f0137af0d1b726bf61ff35d1d7d2eb (diff)
downloadlinux-894554c1ca793ad96a26b7c9f1eedd043e9e8164.tar.bz2
Merge tag 'driver-core-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH: "Here are two small driver core fixes to resolve some reported issues The first is to handle the much-reported (by the build systems) problem that superH does not boot anymore. The second handles an issue in the new platform logic that a number of people ran into with the automated tests in kbuild Both of these have been in linux-next with no reported issues" * tag 'driver-core-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: drivers: Fix boot problem on SuperH of/platform: Unconditionally pause/resume sync state during kernel init
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/platform.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 7c532548b0a6..cf6b6b722e5c 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1325,10 +1325,14 @@ struct device *platform_find_device_by_driver(struct device *start,
}
EXPORT_SYMBOL_GPL(platform_find_device_by_driver);
+void __weak __init early_platform_cleanup(void) { }
+
int __init platform_bus_init(void)
{
int error;
+ early_platform_cleanup();
+
error = device_register(&platform_bus);
if (error) {
put_device(&platform_bus);