From b0a597cbde456e7b3356692a310c565b0b60a02c Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Fri, 5 Feb 2010 13:14:04 +0100
Subject: [PATCH] --- yaml --- r: 180519 b: refs/heads/master c:
 531c2dc70d339c5dfa8c3eb628c3459dc6f3a075 h: refs/heads/master i:   180517:
 bf8d02d24d0e671f952d5f687373a3a633cc27c7   180515:
 72d8cf9bbd3cbe916c3540df64b853c91b8e4936   180511:
 c0355c4cc4378320c3a134d6d7b3bd7d7068a208 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/block/cciss.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bf73e5af36be..966516d5b4e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae54abed636d18f7939c965f21ad126001dbe34c
+refs/heads/master: 531c2dc70d339c5dfa8c3eb628c3459dc6f3a075
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 873e594860d3..9291614ac6b7 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -337,6 +337,9 @@ static int cciss_seq_show(struct seq_file *seq, void *v)
 	if (*pos > h->highest_lun)
 		return 0;
 
+	if (drv == NULL) /* it's possible for h->drv[] to have holes. */
+		return 0;
+
 	if (drv->heads == 0)
 		return 0;