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;