diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2007-01-23 11:25:30 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-27 09:26:08 -0600 |
| commit | 7dce0e1c84cfa8fb2a4b41877c20def386cade2b (patch) | |
| tree | 2a60e63bbeca90cf5c91663c9b5fcdc5e04ff125 /drivers/scsi/ipr.c | |
| parent | 6d84c944fa17cf4e65660df50a0772f8a4836e0b (diff) | |
| download | lwn-7dce0e1c84cfa8fb2a4b41877c20def386cade2b.tar.gz lwn-7dce0e1c84cfa8fb2a4b41877c20def386cade2b.zip | |
[SCSI] ipr: Tolerate not finding PCI-X registers
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>
Diffstat (limited to 'drivers/scsi/ipr.c')
| -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) { 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) { @@ -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; |