diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2007-03-29 13:43:23 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-04-01 12:17:42 -0400 |
| commit | a9aedb098437655b7b78d66e0e28405830cbdbef (patch) | |
| tree | 63bc6ce9f75ecf3c535b97f72f623b2b13ca861e /drivers/scsi/ipr.c | |
| parent | 24d6f2b50bd34d0da540a9e6f71c4b6ab25f4b93 (diff) | |
[SCSI] ipr: PCI unblock config access fix
Fix to make sure user config accesses get re-enabled if the
PCI config write to start BIST fails.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index fc1171c7def4..b502c831cc5e 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
| @@ -6390,6 +6390,7 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd) | |||
| 6390 | rc = pci_write_config_byte(ioa_cfg->pdev, PCI_BIST, PCI_BIST_START); | 6390 | rc = pci_write_config_byte(ioa_cfg->pdev, PCI_BIST, PCI_BIST_START); |
| 6391 | 6391 | ||
| 6392 | if (rc != PCIBIOS_SUCCESSFUL) { | 6392 | if (rc != PCIBIOS_SUCCESSFUL) { |
| 6393 | pci_unblock_user_cfg_access(ipr_cmd->ioa_cfg->pdev); | ||
| 6393 | ipr_cmd->ioasa.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR); | 6394 | ipr_cmd->ioasa.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR); |
| 6394 | rc = IPR_RC_JOB_CONTINUE; | 6395 | rc = IPR_RC_JOB_CONTINUE; |
| 6395 | } else { | 6396 | } else { |