diff options
| author |   Finn Thain <fthain@telegraphics.com.au> | 2018-05-09 11:04:48 +1000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-14 16:27:08 +0200 |
| commit | bdeeed098811b36d1f988521600a89a400830a4b (patch) | |
| tree | 7447eae93d4e230c85f70eee6ea57c95f3566784 /drivers/nubus/nubus.c | |
| parent | ARM: amba: Fix wrong indentation in driver_override_store() (diff) | |
| download | linux-dev-bdeeed098811b36d1f988521600a89a400830a4b.tar.xz linux-dev-bdeeed098811b36d1f988521600a89a400830a4b.zip | |
nubus: Call bus_register unconditionally
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 <gregkh@linuxfoundation.org>
Reported-by: Michael Schmitz <schmitzmic@gmail.com>
Tested-by: Stan Johnson <userm57@yahoo.com>
Fixes: 7f86c765a6a2 ("nubus: Add support for the driver model")
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/nubus/nubus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c index 4621ff98138c..bb0d63a44f41 100644 --- a/drivers/nubus/nubus.c +++ b/drivers/nubus/nubus.c @@ -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(); |