[POWERPC] iSeries: fix viodasd init
From: Stephen Rothwell <hidden>
Date: 2006-12-15 04:39:57
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Don't initialise viodasd except on legacy iSeries. Signed-off-by: Stephen Rothwell <redacted> --- drivers/block/viodasd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index e19ba4e..68592c3 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c@@ -49,6 +49,7 @@ #include <asm/iseries/hv_lp_event.h> #include <asm/iseries/hv_lp_config.h> #include <asm/iseries/vio.h> +#include <asm/firmware.h> MODULE_DESCRIPTION("iSeries Virtual DASD"); MODULE_AUTHOR("Dave Boutcher");
@@ -769,6 +770,11 @@ static int __init viodasd_init(void) { int rc; + if (!firmware_has_feature(FW_FEATURE_ISERIES)) { + rc = -ENODEV; + goto early_fail; + } + /* Try to open to our host lp */ if (viopath_hostLp == HvLpIndexInvalid) vio_set_hostlp();
--
1.4.4.2