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

Commit cc2a8ea8 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: support 64 bit DMA masks 



This patch adds consistent DMA masks for 64 bit

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b73cdf27

drivers/net/wireless/iwlwifi/iwl4965-base.c

+10 −4
Original line number Diff line number Diff line
@@ -7440,14 +7440,20 @@ 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);

	if (!err)

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

	if (err)