[POWERPC] iSeries: fix viotape init

Stephen Rothwell sfr at canb.auug.org.au
Fri Dec 15 15:41:43 EST 2006


Only initialise viotape on legacy iSeries.

Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---
 drivers/char/viotape.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 73c78bf..0c5b7d7 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -49,7 +49,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
-
+#include <asm/firmware.h>
 #include <asm/vio.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
@@ -997,6 +997,9 @@ int __init viotap_init(void)
 	int ret;
 	struct proc_dir_entry *e;
 
+	if (!firmware_has_feature(FW_FEATURE_ISERIES))
+		return -ENODEV;
+
 	op_struct_list = NULL;
 	if ((ret = add_op_structs(VIOTAPE_MAXREQ)) < 0) {
 		printk(VIOTAPE_KERN_WARN "couldn't allocate op structs\n");
-- 
1.4.4.2




More information about the Linuxppc-dev mailing list