---

yaml --- r: 181339 b: refs/heads/master c: c7f172d h: refs/heads/master i: 181337: 9f7a44f 181335: bed1d13 v: v3
git-mirror · Feb 17, 2010 · a5f8757 · a5f8757
1 parent 21417b3
commit a5f8757
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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++;
 	}