diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-07-26 18:41:30 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-08-01 10:00:56 -0400 |
| commit | 6fdc99a224bd52020c602c3d4d57e5f8a75f6bb8 (patch) | |
| tree | 34eccedf0dd9d24e6c9b73d7d24bacaac7595446 /drivers | |
| parent | dbf0c89c80e47a2a132048dcded0dcc2a59c74ad (diff) | |
| download | op-kernel-dev-6fdc99a224bd52020c602c3d4d57e5f8a75f6bb8.zip op-kernel-dev-6fdc99a224bd52020c602c3d4d57e5f8a75f6bb8.tar.gz | |
libata-sff; Unbreak non DMA capable controllers again
Seems nobody else is checking/testing this case as it keeps getting
horked.
If we have no BAR4 mapping on an SFF controller this is *NOT* an error,
it just means it isn't doing BMDMA.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
| -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) |
