A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 19:51:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

nubus: Call bus_register unconditionally

Browse source 
Loading a NuBus driver module on a non-NuBus machine triggers the
BUG_ON(!drv->bus->p) in driver_register(), because bus_register() was
not called, because it is conditional on MACH_IS_MAC.

Fix the crash by calling bus_register() unconditionally. Call it from
a postcore_initcall(), like other busses do.

Hence, the bus type is available for device_register(), which happens
in a subsys initcall, and for driver_register(), which happens in a
device or module initcall.

Cc: Greg Kroah-Hartman <[email protected]>
Reported-by: Michael Schmitz <[email protected]>
Tested-by: Stan Johnson <[email protected]>
Fixes: 7f86c765a6 ("nubus: Add support for the driver model")
Signed-off-by: Finn Thain <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Finn Thain 2018-05-09 11:04:48 +10:00 • committed by Greg Kroah-Hartman
commit bdeeed0988
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/nubus/bus.c
View file

@ -63,20 +63,15 @@ static struct device nubus_parent = {
.init_name = "nubus",
};
int __init nubus_bus_register(void)
static int __init nubus_bus_register(void)
{
int err;
return bus_register(&nubus_bus_type);
}
postcore_initcall(nubus_bus_register);
err = device_register(&nubus_parent);
if (err)
return err;
err = bus_register(&nubus_bus_type);
if (!err)
return 0;
device_unregister(&nubus_parent);
return err;
int __init nubus_parent_device_register(void)
{
return device_register(&nubus_parent);
}
static void nubus_device_release(struct device *dev)

2
drivers/nubus/nubus.c
View file

@ -875,7 +875,7 @@ static int __init nubus_init(void)
return 0;
nubus_proc_init();
err = nubus_bus_register();
err = nubus_parent_device_register();
if (err)
return err;
nubus_scan_bus();