aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
authorWinkler, Tomas <tomas.winkler@intel.com>2008-09-26 03:09:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-30 14:07:22 -0400
commit093d874c02e8d3091aa38596faf0ff2bfd4f0ceb (patch)
tree81965c3a98e9fca562010107717df2a7accf9522 /drivers/net/wireless/iwlwifi/iwl-agn.c
parente602cb180e97c46dfb01a4644781ec68ee0cda22 (diff)
iwlwifi: use correct DMA_MASK
Use correct DMA_MASK: 4964 and 5000 support 36 bit addresses for pci express memory access. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index a589f7ea57f3..204abab76449 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/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
4243 4243
4244 pci_set_master(pdev); 4244 pci_set_master(pdev);
4245 4245
4246 err = pci_set_dma_mask(pdev, DMA_64BIT_MASK); 4246 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
4247 if (!err) 4247 if (!err)
4248 err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); 4248 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(36));
4249 if (err) { 4249 if (err) {
4250 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 4250 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
4251 if (!err) 4251 if (!err)
4252 err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 4252 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
4253 /* both attempts failed: */ 4253 /* both attempts failed: */
4254 if (err) { 4254 if (err) {
4255 printk(KERN_WARNING "%s: No suitable DMA available.\n", 4255 printk(KERN_WARNING "%s: No suitable DMA available.\n",