diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 11:41:41 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 11:41:41 -0500 |
| commit | 38a9a621aba953ddb8051547e98c10ec3c741312 (patch) | |
| tree | 53fc96a2902d2c5bf2a82d97d99b78570c76291e /drivers/scsi/aacraid/linit.c | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
| parent | e75d51761debffbc5e556e02c8ceda4f8c1a3e83 (diff) | |
| download | linux-38a9a621aba953ddb8051547e98c10ec3c741312.tar.gz linux-38a9a621aba953ddb8051547e98c10ec3c741312.tar.bz2 linux-38a9a621aba953ddb8051547e98c10ec3c741312.zip | |
Merge HEAD from ../scsi-misc-2.6-old
Diffstat (limited to 'drivers/scsi/aacraid/linit.c')
| -rw-r--r-- | drivers/scsi/aacraid/linit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index a1f9ceef0ac9..c235d0c0e7a7 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -752,8 +752,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, if (error) goto out; - if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL) || - pci_set_consistent_dma_mask(pdev, 0xFFFFFFFFULL)) + if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || + pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) goto out; /* * If the quirk31 bit is set, the adapter needs adapter @@ -797,9 +797,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, * address space. */ if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) - if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL)) - goto out_free_fibs; - + if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) + goto out_deinit; + aac->maximum_num_channels = aac_drivers[index].channels; error = aac_get_adapter_info(aac); if (error < 0) |