diff options
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r-- | drivers/scsi/ipr.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 5bbaee597e88..524d586c3147 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -7487,16 +7487,10 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd) | |||
7487 | { | 7487 | { |
7488 | struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg; | 7488 | struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg; |
7489 | volatile u32 int_reg; | 7489 | volatile u32 int_reg; |
7490 | int rc; | ||
7491 | 7490 | ||
7492 | ENTER; | 7491 | ENTER; |
7493 | ioa_cfg->pdev->state_saved = true; | 7492 | ioa_cfg->pdev->state_saved = true; |
7494 | rc = pci_restore_state(ioa_cfg->pdev); | 7493 | pci_restore_state(ioa_cfg->pdev); |
7495 | |||
7496 | if (rc != PCIBIOS_SUCCESSFUL) { | ||
7497 | ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR); | ||
7498 | return IPR_RC_JOB_CONTINUE; | ||
7499 | } | ||
7500 | 7494 | ||
7501 | if (ipr_set_pcix_cmd_reg(ioa_cfg)) { | 7495 | if (ipr_set_pcix_cmd_reg(ioa_cfg)) { |
7502 | ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR); | 7496 | ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR); |