diff options
| author | Ron Rindjunsky | 2008-04-22 00:41:59 +0200 |
|---|---|---|
| committer | John W. Linville | 2008-05-07 21:02:16 +0200 |
| commit | cc2a8ea82ef869532cb7764b9eac30338773fe88 (patch) | |
| tree | 6d8a0930deeb94639b50f47c279a69b9cc2d70e3 /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
| parent | iwlwifi: CT-Kill configuration fix (diff) | |
| download | kernel-qcow2-linux-cc2a8ea82ef869532cb7764b9eac30338773fe88.tar.gz kernel-qcow2-linux-cc2a8ea82ef869532cb7764b9eac30338773fe88.tar.xz kernel-qcow2-linux-cc2a8ea82ef869532cb7764b9eac30338773fe88.zip | |
iwlwifi: support 64 bit DMA masks
This patch adds consistent DMA masks for 64 bit
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 6309f08c3a13..028523af0104 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -7440,13 +7440,19 @@ 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_32BIT_MASK); + err = pci_set_dma_mask(pdev, DMA_64BIT_MASK); if (!err) - err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); + err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); + if (err) { + err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); + if (!err) + err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); + /* both attempts failed: */ if (err) { - printk(KERN_WARNING DRV_NAME - ": No suitable DMA available.\n"); + printk(KERN_WARNING "%s: No suitable DMA available.\n", + DRV_NAME); goto out_pci_disable_device; + } } err = pci_request_regions(pdev, DRV_NAME); |