diff options
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm_pci.c')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c index 0d44a6907dd2..3ce77ddc889e 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | |||
@@ -180,6 +180,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
180 | struct ahc_pci_identity *entry; | 180 | struct ahc_pci_identity *entry; |
181 | char *name; | 181 | char *name; |
182 | int error; | 182 | int error; |
183 | struct device *dev = &pdev->dev; | ||
183 | 184 | ||
184 | pci = pdev; | 185 | pci = pdev; |
185 | entry = ahc_find_pci_device(pci); | 186 | entry = ahc_find_pci_device(pci); |
@@ -209,11 +210,12 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
209 | pci_set_master(pdev); | 210 | pci_set_master(pdev); |
210 | 211 | ||
211 | if (sizeof(dma_addr_t) > 4 | 212 | if (sizeof(dma_addr_t) > 4 |
212 | && ahc_linux_get_memsize() > 0x80000000 | 213 | && ahc->features & AHC_LARGE_SCBS |
213 | && pci_set_dma_mask(pdev, mask_39bit) == 0) { | 214 | && dma_set_mask(dev, mask_39bit) == 0 |
215 | && dma_get_required_mask(dev) > DMA_32BIT_MASK) { | ||
214 | ahc->flags |= AHC_39BIT_ADDRESSING; | 216 | ahc->flags |= AHC_39BIT_ADDRESSING; |
215 | } else { | 217 | } else { |
216 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 218 | if (dma_set_mask(dev, DMA_32BIT_MASK)) { |
217 | printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n"); | 219 | printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n"); |
218 | return (-ENODEV); | 220 | return (-ENODEV); |
219 | } | 221 | } |