From c7be5c90c0a38ebcda26eda4736c1ede33704b40 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 4 Feb 2010 08:43:36 -0600
Subject: [PATCH] --- yaml --- r: 181340 b: refs/heads/master c:
 23231048309ea8eed0189f1eb8f870f08703cac0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 10816c61ff38..470d2f3511aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7f172dca210bbd105aee02353c6b385c774caac
+refs/heads/master: 23231048309ea8eed0189f1eb8f870f08703cac0
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index 42295c49682f..2764cb605693 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -776,6 +776,8 @@ static int hpsa_scsi_find_entry(struct hpsa_scsi_dev_t *needle,
 #define DEVICE_CHANGED 1
 #define DEVICE_SAME 2
 	for (i = 0; i < haystack_size; i++) {
+		if (haystack[i] == NULL) /* previously removed. */
+			continue;
 		if (SCSI3ADDR_EQ(needle->scsi3addr, haystack[i]->scsi3addr)) {
 			*index = i;
 			if (device_is_the_same(needle, haystack[i]))