diff options
| author | Mark Haverkamp <markh@osdl.org> | 2006-03-27 09:44:11 -0800 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-13 10:13:18 -0500 |
| commit | e61b17fd3ae270c0ca83d12c8276b73e50466db9 (patch) | |
| tree | a430ae23f1c470b731fc78745bc7642bf1ca9305 /drivers/scsi | |
| parent | 31876f328f22435c21cfc27f0c871a4a4b22f9db (diff) | |
| download | op-kernel-dev-e61b17fd3ae270c0ca83d12c8276b73e50466db9.zip op-kernel-dev-e61b17fd3ae270c0ca83d12c8276b73e50466db9.tar.gz | |
[SCSI] aacraid: Error path cleanup
Received from Mark Salyzyn
Some of the error return paths during initialization resulted in a zero
report to caller
Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/aacraid/linit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 9f3cc7b..78c82f7 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -800,10 +800,11 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, error = pci_enable_device(pdev); if (error) goto out; + error = -ENODEV; if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) - goto out; + goto out_disable_pdev; /* * If the quirk31 bit is set, the adapter needs adapter * to driver communication memory to be allocated below 2gig @@ -811,7 +812,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) || pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK)) - goto out; + goto out_disable_pdev; pci_set_master(pdev); |
