diff options
-rw-r--r-- | drivers/scsi/ipr.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 0f1d654ea352..39133748fb73 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -595,10 +595,8 @@ static int ipr_save_pcix_cmd_reg(struct ipr_ioa_cfg *ioa_cfg) | |||
595 | { | 595 | { |
596 | int pcix_cmd_reg = pci_find_capability(ioa_cfg->pdev, PCI_CAP_ID_PCIX); | 596 | int pcix_cmd_reg = pci_find_capability(ioa_cfg->pdev, PCI_CAP_ID_PCIX); |
597 | 597 | ||
598 | if (pcix_cmd_reg == 0) { | 598 | if (pcix_cmd_reg == 0) |
599 | dev_err(&ioa_cfg->pdev->dev, "Failed to save PCI-X command register\n"); | 599 | return 0; |
600 | return -EIO; | ||
601 | } | ||
602 | 600 | ||
603 | if (pci_read_config_word(ioa_cfg->pdev, pcix_cmd_reg + PCI_X_CMD, | 601 | if (pci_read_config_word(ioa_cfg->pdev, pcix_cmd_reg + PCI_X_CMD, |
604 | &ioa_cfg->saved_pcix_cmd_reg) != PCIBIOS_SUCCESSFUL) { | 602 | &ioa_cfg->saved_pcix_cmd_reg) != PCIBIOS_SUCCESSFUL) { |
@@ -627,10 +625,6 @@ static int ipr_set_pcix_cmd_reg(struct ipr_ioa_cfg *ioa_cfg) | |||
627 | dev_err(&ioa_cfg->pdev->dev, "Failed to setup PCI-X command register\n"); | 625 | dev_err(&ioa_cfg->pdev->dev, "Failed to setup PCI-X command register\n"); |
628 | return -EIO; | 626 | return -EIO; |
629 | } | 627 | } |
630 | } else { | ||
631 | dev_err(&ioa_cfg->pdev->dev, | ||
632 | "Failed to setup PCI-X command register\n"); | ||
633 | return -EIO; | ||
634 | } | 628 | } |
635 | 629 | ||
636 | return 0; | 630 | return 0; |