From ea870299c792dc37785db248d9f4a0d152e56313 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 13 Nov 2008 19:11:57 -0800 Subject: [PATCH] --- yaml --- r: 122287 b: refs/heads/master c: 97b777db57f7226e31a4abd5e69d732037743195 h: refs/heads/master i: 122285: 84254986f0afb7f5148eac89e551c5a7ca685f2b 122283: da4e477945e6638940fd97c0f8e41f49a2769799 122279: eeecd48a2c591ef5da2ae950c2dc3ecdb934ff58 122271: 3d9cb0dd38b532461fa05ac2d9897b096dec5493 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath9k/main.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 95600b1ebf0a..dd28c5a128f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d450cfc97bc223e9f94a2fab888bb168e284448 +refs/heads/master: 97b777db57f7226e31a4abd5e69d732037743195 diff --git a/trunk/drivers/net/wireless/ath9k/main.c b/trunk/drivers/net/wireless/ath9k/main.c index 9d64ef565c03..3355ba4043e8 100644 --- a/trunk/drivers/net/wireless/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath9k/main.c @@ -1591,9 +1591,18 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (pci_enable_device(pdev)) return -EIO; - if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { + ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + + if (ret) { printk(KERN_ERR "ath9k: 32-bit DMA not available\n"); - ret = -ENODEV; + goto bad; + } + + ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); + + if (ret) { + printk(KERN_ERR "ath9k: 32-bit DMA consistent " + "DMA enable faled\n"); goto bad; }