Skip to content

Commit

Permalink
[SCSI] ipr: Tolerate not finding PCI-X registers
Browse files Browse the repository at this point in the history
Don't fail initialization of an adapter if the PCI-X registers
cannot be found since it may be a PCI-E adapter.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  • Loading branch information
Brian King authored and James Bottomley committed Jan 27, 2007
1 parent 6d84c94 commit 7dce0e1
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions drivers/scsi/ipr.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,8 @@ static int ipr_save_pcix_cmd_reg(struct ipr_ioa_cfg *ioa_cfg)
{
int pcix_cmd_reg = pci_find_capability(ioa_cfg->pdev, PCI_CAP_ID_PCIX);

if (pcix_cmd_reg == 0) {
dev_err(&ioa_cfg->pdev->dev, "Failed to save PCI-X command register\n");
return -EIO;
}
if (pcix_cmd_reg == 0)
return 0;

if (pci_read_config_word(ioa_cfg->pdev, pcix_cmd_reg + PCI_X_CMD,
&ioa_cfg->saved_pcix_cmd_reg) != PCIBIOS_SUCCESSFUL) {
Expand Down Expand Up @@ -627,10 +625,6 @@ static int ipr_set_pcix_cmd_reg(struct ipr_ioa_cfg *ioa_cfg)
dev_err(&ioa_cfg->pdev->dev, "Failed to setup PCI-X command register\n");
return -EIO;
}
} else {
dev_err(&ioa_cfg->pdev->dev,
"Failed to setup PCI-X command register\n");
return -EIO;
}

return 0;
Expand Down

0 comments on commit 7dce0e1

Please sign in to comment.