---

yaml --- r: 270967 b: refs/heads/master c: 5d7c20b h: refs/heads/master i: 270965: f93e43e 270963: 3ec70d3 270959: 1bb129c v: v3
git-mirror · Aug 27, 2011 · c6d07b8 · c6d07b8
1 parent 714fb91
commit c6d07b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98cbe371fd373f13806595835b79da07f3a2f934
+refs/heads/master: 5d7c20b7fa5c6ca19e871b4050e321c99d32bd43
diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c
@@ -8812,7 +8812,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
 	uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg32);
 	if ((mask & IPR_PCII_HRRQ_UPDATED) == 0 || (uproc & IPR_UPROCI_RESET_ALERT))
 		ioa_cfg->needs_hard_reset = 1;
-	if (interrupts & IPR_PCII_ERROR_INTERRUPTS)
+	if ((interrupts & IPR_PCII_ERROR_INTERRUPTS) || reset_devices)
 		ioa_cfg->needs_hard_reset = 1;
 	if (interrupts & IPR_PCII_IOA_UNIT_CHECKED)
 		ioa_cfg->ioa_unit_checked = 1;