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

Commit 9f904b38 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: don't enable interrupt as a W/A when MSI is enabled 



This is not needed, the comment there was wrong, it
is only needed when MSI was *not* enabled.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent dbeca583

drivers/net/wireless/iwlwifi/pcie/trans.c

+8 −9
Original line number Diff line number Diff line
@@ -2184,9 +2184,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);



	err = pci_enable_msi(pdev);

	if (err)

	if (err) {

		dev_printk(KERN_ERR, &pdev->dev,

			   "pci_enable_msi failed(0X%x)\n", err);

		/* enable rfkill interrupt: hw bug w/a */

		pci_read_config_word(pdev, PCI_COMMAND, &pci_cmd);

		if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {

			pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;

			pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);

		}

	}



	trans->dev = &pdev->dev;

	trans_pcie->irq = pdev->irq;
@@ -2196,14 +2203,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, 
	snprintf(trans->hw_id_str, sizeof(trans->hw_id_str),

		 "PCI ID: 0x%04X:0x%04X", pdev->device, pdev->subsystem_device);



	/* TODO: Move this away, not needed if not MSI */

	/* enable rfkill interrupt: hw bug w/a */

	pci_read_config_word(pdev, PCI_COMMAND, &pci_cmd);

	if (pci_cmd & PCI_COMMAND_INTX_DISABLE) {

		pci_cmd &= ~PCI_COMMAND_INTX_DISABLE;

		pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);

	}



	/* Initialize the wait queue for commands */

	init_waitqueue_head(&trans_pcie->wait_command_queue);

	spin_lock_init(&trans->reg_lock);