lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: allow pci_enable_msi fail

Browse Source 
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>
This commit is contained in:
Wey-Yi Guy
2011-10-27 17:19:39 -07:00
committed by John W. Linville
parent 3209e061ad
commit 8a39ef8ba0
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/iwlwifi/iwl-pci.c
View File

@@ -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); pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
err = pci_enable_msi(pdev); err = pci_enable_msi(pdev);
if (err) { if (err)
dev_printk(KERN_ERR, &pdev->dev, "pci_enable_msi failed"); dev_printk(KERN_ERR, &pdev->dev,
goto out_iounmap; "pci_enable_msi failed(0X%x)", err);
}
/* TODO: Move this away, not needed if not MSI */ /* TODO: Move this away, not needed if not MSI */
/* enable rfkill interrupt: hw bug w/a */ /* 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: out_disable_msi:
pci_disable_msi(pdev); pci_disable_msi(pdev);
out_iounmap:
pci_iounmap(pdev, pci_bus->hw_base); pci_iounmap(pdev, pci_bus->hw_base);
out_pci_release_regions: out_pci_release_regions:
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);