Skip to content

Commit

Permalink
nubus: Call bus_register unconditionally
Browse files Browse the repository at this point in the history
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: 7f86c76 ("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]>
  • Loading branch information
Finn Thain authored and gregkh committed May 14, 2018
1 parent 6be5b5b commit bdeeed0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 14 deletions.
19 changes: 7 additions & 12 deletions drivers/nubus/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

err = device_register(&nubus_parent);
if (err)
return err;

err = bus_register(&nubus_bus_type);
if (!err)
return 0;
return bus_register(&nubus_bus_type);
}
postcore_initcall(nubus_bus_register);

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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/nubus/nubus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion include/linux/nubus.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void nubus_seq_write_rsrc_mem(struct seq_file *m,
unsigned char *nubus_dirptr(const struct nubus_dirent *nd);

/* Declarations relating to driver model objects */
int nubus_bus_register(void);
int nubus_parent_device_register(void);
int nubus_device_register(struct nubus_board *board);
int nubus_driver_register(struct nubus_driver *ndrv);
void nubus_driver_unregister(struct nubus_driver *ndrv);
Expand Down

0 comments on commit bdeeed0

Please sign in to comment.