diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:36:28 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-02 22:36:28 +0100 |
| commit | f2d40cd92c5604a868b22c44a7858206ae4fcf35 (patch) | |
| tree | 40f3e49465ede8982f6b95b7ba51b9a9ebf22ff6 /drivers/ata/libata-sff.c | |
| parent | 3ca135e16a393e5c5cf6490ce751e43c59011dde (diff) | |
| parent | 7a883eaf62f4b943ebec738ce3b0796c67ef5d32 (diff) | |
| download | op-kernel-dev-f2d40cd92c5604a868b22c44a7858206ae4fcf35.zip op-kernel-dev-f2d40cd92c5604a868b22c44a7858206ae4fcf35.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/libata-sff.c')
| -rw-r--r-- | drivers/ata/libata-sff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 6c289c7..1cce219 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -573,6 +573,10 @@ int ata_pci_init_bmdma(struct ata_host *host) struct pci_dev *pdev = to_pci_dev(gdev); int i, rc; + /* No BAR4 allocation: No DMA */ + if (pci_resource_start(pdev, 4) == 0) + return 0; + /* TODO: If we get no DMA mask we should fall back to PIO */ rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); if (rc) |
