Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: werner <w.landgraf@ru.ru>
Tested-by: werner <w.landgraf@ru.ru>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Wey-Yi Guy and committed by
John W. Linville
8a39ef8b 3209e061

+3 -5
+3 -5
drivers/net/wireless/iwlwifi/iwl-pci.c
··· 445 445 pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00); 446 446 447 447 err = pci_enable_msi(pdev); 448 - if (err) { 449 - dev_printk(KERN_ERR, &pdev->dev, "pci_enable_msi failed"); 450 - goto out_iounmap; 451 - } 448 + if (err) 449 + dev_printk(KERN_ERR, &pdev->dev, 450 + "pci_enable_msi failed(0X%x)", err); 452 451 453 452 /* TODO: Move this away, not needed if not MSI */ 454 453 /* enable rfkill interrupt: hw bug w/a */ ··· 468 469 469 470 out_disable_msi: 470 471 pci_disable_msi(pdev); 471 - out_iounmap: 472 472 pci_iounmap(pdev, pci_bus->hw_base); 473 473 out_pci_release_regions: 474 474 pci_set_drvdata(pdev, NULL);