From a5f87574fd4e90a22627a05e897c3876ff994981 Mon Sep 17 00:00:00 2001
From: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
Date: Thu, 4 Feb 2010 08:43:31 -0600
Subject: [PATCH] --- yaml --- r: 181339 b: refs/heads/master c:
 c7f172dca210bbd105aee02353c6b385c774caac h: refs/heads/master i:   181337:
 9f7a44f9f71ca0be98a120c8608e741efba1e025   181335:
 bed1d1329b45244da98d6417395eb00c2a436401 v: v3

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

diff --git a/[refs] b/[refs]
index 5af2ab16c7ea..10816c61ff38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 807be732f928c75b3dfb4273fe5f61b34f05df86
+refs/heads/master: c7f172dca210bbd105aee02353c6b385c774caac
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
index b91ccd436acb..42295c49682f 100644
--- a/trunk/drivers/scsi/hpsa.c
+++ b/trunk/drivers/scsi/hpsa.c
@@ -838,7 +838,11 @@ static void adjust_hpsa_scsi_table(struct ctlr_info *h, int hostno,
 			(void) hpsa_scsi_add_entry(h, hostno, sd[entry],
 				added, &nadded);
 			/* add can't fail, we just removed one. */
-			sd[entry] = NULL; /* prevent it from being freed */
+
+			/* Set it to NULL to prevent it from being freed
+			 * at the bottom of hpsa_update_scsi_devices()
+			 */
+			sd[entry] = NULL;
 		}
 		i++;
 	}