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;
 	}