From c6d07b81666229a380d6847622cd462b6421cfca Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Mon, 1 Aug 2011 19:43:45 +1000 Subject: [PATCH] --- yaml --- r: 270967 b: refs/heads/master c: 5d7c20b7fa5c6ca19e871b4050e321c99d32bd43 h: refs/heads/master i: 270965: f93e43eef6b5e404825ea95ecf1ae6db3dd9bf14 270963: 3ec70d3189e64b249202df92aa2454051ada2a3c 270959: 1bb129c6b7bdb19ff27424fbdaababcb3923413d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ipr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 67b6610dc523..5281fe8a3db0 100644 --- 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 index 8d636301e32c..acbb9241262d 100644 --- 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;