---

yaml --- r: 44756 b: refs/heads/master c: fb8b500 h: refs/heads/master v: v3
git-mirror · Dec 20, 2006 · 0de4f7e · 0de4f7e
1 parent 4846e0c
commit 0de4f7e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f67f9d26fe5ced50f716e9620b42c0721d8b8d9
+refs/heads/master: fb8b50078458ba74c3d3f7bf05f5ddc27b88f051
diff --git a/trunk/drivers/block/viodasd.c b/trunk/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();