浏览代码

[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 <davem@davemloft.net>
David S. Miller 18 年之前
父节点
当前提交
f8be339c02
共有 1 个文件被更改,包括 7 次插入7 次删除
  1. 7 7
      arch/sparc64/kernel/vio.c

+ 7 - 7
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);