aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authorTakashi Iwai2008-12-24 11:04:08 +0100
committerTakashi Iwai2008-12-24 11:04:08 +0100
commit7645c4bfbb36f357f03815f5729c46ce8d89f008 (patch)
treeeb2c45bbdfc715a9a6e96e6af9675a0440ef8ff1 /drivers/block/cciss.c
parent74b7ff48a93f44198ac03cc4e628d713f53d4668 (diff)
parent574f3c4f5c55e99ea60f71fd98cc54931d4b2eae (diff)
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r--drivers/block/cciss.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 9364dc554257..9f7c543cc04b 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1693,6 +1693,11 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time)
for (i = 0; i <= h->highest_lun; i++) {
int j;
drv_found = 0;
+
+ /* skip holes in the array from already deleted drives */
+ if (h->drv[i].raid_level == -1)
+ continue;
+
for (j = 0; j < num_luns; j++) {
memcpy(&lunid, &ld_buff->LUN[j][0], 4);
lunid = le32_to_cpu(lunid);