aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-pci.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 3b6cc66365e..19cc6a81da5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -445,10 +445,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
445 pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00); 445 pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
446 446
447 err = pci_enable_msi(pdev); 447 err = pci_enable_msi(pdev);
448 if (err) { 448 if (err)
449 dev_printk(KERN_ERR, &pdev->dev, "pci_enable_msi failed"); 449 dev_printk(KERN_ERR, &pdev->dev,
450 goto out_iounmap; 450 "pci_enable_msi failed(0X%x)", err);
451 }
452 451
453 /* TODO: Move this away, not needed if not MSI */ 452 /* TODO: Move this away, not needed if not MSI */
454 /* enable rfkill interrupt: hw bug w/a */ 453 /* 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)
469 468
470out_disable_msi: 469out_disable_msi:
471 pci_disable_msi(pdev); 470 pci_disable_msi(pdev);
472out_iounmap:
473 pci_iounmap(pdev, pci_bus->hw_base); 471 pci_iounmap(pdev, pci_bus->hw_base);
474out_pci_release_regions: 472out_pci_release_regions:
475 pci_set_drvdata(pdev, NULL); 473 pci_set_drvdata(pdev, NULL);