From e290ad1ab1983c30c5875c85dbb68f200fd6206c Mon Sep 17 00:00:00 2001 From: "Winkler, Tomas" Date: Fri, 26 Sep 2008 15:09:34 +0800 Subject: [PATCH] --- yaml --- r: 111971 b: refs/heads/master c: 093d874c02e8d3091aa38596faf0ff2bfd4f0ceb h: refs/heads/master i: 111969: 32cdfc4a7ed591ad79fa28987fdce3016452f47a 111967: fefb9834aeac6b467825dd31b8d5910cff102978 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e0e8cf725e0c..3dbffb58a125 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e602cb180e97c46dfb01a4644781ec68ee0cda22 +refs/heads/master: 093d874c02e8d3091aa38596faf0ff2bfd4f0ceb diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index a589f7ea57f3..204abab76449 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -4243,13 +4243,13 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e pci_set_master(pdev); - err = pci_set_dma_mask(pdev, DMA_64BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36)); if (!err) - err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(36)); if (err) { - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (!err) - err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); /* both attempts failed: */ if (err) { printk(KERN_WARNING "%s: No suitable DMA available.\n",