Commit f8be339c authored by David S. Miller's avatar David S. Miller
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f0234f4

arch/sparc64/kernel/vio.c

+7 −7
Original line number Diff line number Diff line
@@ -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);