Преглед на файлове

[POWERPC] iSeries: fix viocd init

Only initialise viocd on legacy iSeries.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Stephen Rothwell преди 18 години
родител
ревизия
31c72ad0d1
променени са 1 файла, в които са добавени 4 реда и са изтрити 0 реда
  1. 4 0
      drivers/cdrom/viocd.c

+ 4 - 0
drivers/cdrom/viocd.c

@@ -47,6 +47,7 @@
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/vio.h>
+#include <asm/firmware.h>
 
 
 #define VIOCD_DEVICE			"iseries/vcd"
 #define VIOCD_DEVICE			"iseries/vcd"
 
 
@@ -748,6 +749,9 @@ static int __init viocd_init(void)
 	struct proc_dir_entry *e;
 	struct proc_dir_entry *e;
 	int ret = 0;
 	int ret = 0;
 
 
+	if (!firmware_has_feature(FW_FEATURE_ISERIES))
+		return -ENODEV;
+
 	if (viopath_hostLp == HvLpIndexInvalid) {
 	if (viopath_hostLp == HvLpIndexInvalid) {
 		vio_set_hostlp();
 		vio_set_hostlp();
 		/* If we don't have a host, bail out */
 		/* If we don't have a host, bail out */