diff options
-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 9f3cc7b7123d..78c82f774535 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, | |||
800 | error = pci_enable_device(pdev); | 800 | error = pci_enable_device(pdev); |
801 | if (error) | 801 | if (error) |
802 | goto out; | 802 | goto out; |
803 | error = -ENODEV; | ||
803 | 804 | ||
804 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || | 805 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || |
805 | pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) | 806 | pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) |
806 | goto out; | 807 | goto out_disable_pdev; |
807 | /* | 808 | /* |
808 | * If the quirk31 bit is set, the adapter needs adapter | 809 | * If the quirk31 bit is set, the adapter needs adapter |
809 | * to driver communication memory to be allocated below 2gig | 810 | * to driver communication memory to be allocated below 2gig |
@@ -811,7 +812,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, | |||
811 | if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) | 812 | if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) |
812 | if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) || | 813 | if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) || |
813 | pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK)) | 814 | pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK)) |
814 | goto out; | 815 | goto out_disable_pdev; |
815 | 816 | ||
816 | pci_set_master(pdev); | 817 | pci_set_master(pdev); |
817 | 818 | ||