From ce7e98ce9e8cc281fccf9ef3770eb17ed2623718 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 26 Jul 2007 18:41:30 +0100 Subject: [PATCH] --- yaml --- r: 63533 b: refs/heads/master c: 6fdc99a224bd52020c602c3d4d57e5f8a75f6bb8 h: refs/heads/master i: 63531: ec881e18ea3d3d7684ba5cfdb670f6524e5bf027 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-sff.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 965e2f0e6f13..7ba83a3c196a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbf0c89c80e47a2a132048dcded0dcc2a59c74ad +refs/heads/master: 6fdc99a224bd52020c602c3d4d57e5f8a75f6bb8 diff --git a/trunk/drivers/ata/libata-sff.c b/trunk/drivers/ata/libata-sff.c index 6c289c7b1322..1cce2198baaf 100644 --- a/trunk/drivers/ata/libata-sff.c +++ b/trunk/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)