Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 093d874c authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwlwifi: use correct DMA_MASK 



Use correct DMA_MASK: 4964 and 5000 support 36 bit addresses for
pci express memory access.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e602cb18

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −4
Original line number Diff line number Diff line
@@ -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",