aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ipr.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r--drivers/scsi/ipr.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index d3c5905b22ec..9c5c8be72231 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -7515,16 +7515,10 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)
7515{ 7515{
7516 struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg; 7516 struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
7517 volatile u32 int_reg; 7517 volatile u32 int_reg;
7518 int rc;
7519 7518
7520 ENTER; 7519 ENTER;
7521 ioa_cfg->pdev->state_saved = true; 7520 ioa_cfg->pdev->state_saved = true;
7522 rc = pci_restore_state(ioa_cfg->pdev); 7521 pci_restore_state(ioa_cfg->pdev);
7523
7524 if (rc != PCIBIOS_SUCCESSFUL) {
7525 ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);
7526 return IPR_RC_JOB_CONTINUE;
7527 }
7528 7522
7529 if (ipr_set_pcix_cmd_reg(ioa_cfg)) { 7523 if (ipr_set_pcix_cmd_reg(ioa_cfg)) {
7530 ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR); 7524 ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);