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

Commit 8a39ef8b authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: allow pci_enable_msi fail 



Continue the init process even fail to enable msi

out_iounmap is no longer used, remove it

Reported-by: default avatarwerner <w.landgraf@ru.ru>
Tested-by: default avatarwerner <w.landgraf@ru.ru>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3209e061

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

+3 −5
Original line number Diff line number Diff line
@@ -445,10 +445,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);



	err = pci_enable_msi(pdev);

	if (err) {

		dev_printk(KERN_ERR, &pdev->dev, "pci_enable_msi failed");

		goto out_iounmap;

	}

	if (err)

		dev_printk(KERN_ERR, &pdev->dev,

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



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

	/* enable rfkill interrupt: hw bug w/a */
@@ -469,7 +468,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


out_disable_msi:

	pci_disable_msi(pdev);

out_iounmap:

	pci_iounmap(pdev, pci_bus->hw_base);

out_pci_release_regions:

	pci_set_drvdata(pdev, NULL);