From f8be339c02c1e543eee8e09ffe600c0e61be5898 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 14 Jul 2007 00:41:08 -0700 Subject: [SPARC64]: Unconditionally register vio_bus_type. The VIO drivers register themselves unconditionally just like those of any other bus type, so to avoid crashes on non-VIO systems we need to always register vio_bus_type. Signed-off-by: David S. Miller --- arch/sparc64/kernel/vio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'arch') diff --git a/arch/sparc64/kernel/vio.c b/arch/sparc64/kernel/vio.c index 8b269aabff0..49569b44ea1 100644 --- a/arch/sparc64/kernel/vio.c +++ b/arch/sparc64/kernel/vio.c @@ -335,6 +335,13 @@ static int __init vio_init(void) int err, len; u64 root; + err = bus_register(&vio_bus_type); + if (err) { + printk(KERN_ERR "VIO: Could not register bus type err=%d\n", + err); + return err; + } + hp = mdesc_grab(); if (!hp) return 0; @@ -374,13 +381,6 @@ static int __init vio_init(void) cdev_cfg_handle = *cfg_handle; - err = bus_register(&vio_bus_type); - if (err) { - printk(KERN_ERR "VIO: Could not register bus type err=%d\n", - err); - return err; - } - create_devices(hp, root); mdesc_release(hp); -- cgit v1.2.3