[POWERPC] iSeries: fix viocd init
From: Stephen Rothwell <hidden>
Date: 2006-12-15 04:43:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Only initialise viocd on legacy iSeries. Signed-off-by: Stephen Rothwell <redacted> --- drivers/cdrom/viocd.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 54ca931..93fbf84 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c@@ -47,6 +47,7 @@ #include <asm/iseries/hv_types.h> #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/vio.h> +#include <asm/firmware.h> #define VIOCD_DEVICE "iseries/vcd"
@@ -748,6 +749,9 @@ static int __init viocd_init(void) struct proc_dir_entry *e; int ret = 0; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) + return -ENODEV; + if (viopath_hostLp == HvLpIndexInvalid) { vio_set_hostlp(); /* If we don't have a host, bail out */
--
1.4.4.2