From 664b9fa80d5e6007321f98b0bd694c6d95306bb3 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Fri, 17 Dec 2010 09:01:37 +0100
Subject: [PATCH] --- yaml --- r: 223459 b: refs/heads/master c:
 0fc13c8995cd96f4123de400c71c223d80400ed9 h: refs/heads/master i:   223457:
 659b70e6334b0e4948747099391a4cda676d7c33   223455:
 2355060197f0d4bad2fdc16ca667b6fc8574766a v: v3

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

diff --git a/[refs] b/[refs]
index ea22a9d17d31..56f5171fc944 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72d4cd9f38b5ed96b75df4c622be25e1c2648dd3
+refs/heads/master: 0fc13c8995cd96f4123de400c71c223d80400ed9
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index f291587d753e..233e06c29ff4 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -2834,6 +2834,8 @@ static int cciss_revalidate(struct gendisk *disk)
 	InquiryData_struct *inq_buff = NULL;
 
 	for (logvol = 0; logvol < CISS_MAX_LUN; logvol++) {
+		if (!h->drv[logvol])
+			continue
 		if (memcmp(h->drv[logvol]->LunID, drv->LunID,
 			sizeof(drv->LunID)) == 0) {
 			FOUND = 1;