From 23c71dad24d470223a837e3fd20a7e8136e30cbf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 5 Dec 2011 13:05:23 -0800 Subject: [PATCH] 3.1 patches added patches: iwlwifi-allow-pci_enable_msi-fail.patch --- .../iwlwifi-allow-pci_enable_msi-fail.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 queue-3.1/iwlwifi-allow-pci_enable_msi-fail.patch diff --git a/queue-3.1/iwlwifi-allow-pci_enable_msi-fail.patch b/queue-3.1/iwlwifi-allow-pci_enable_msi-fail.patch new file mode 100644 index 00000000000..3577c269642 --- /dev/null +++ b/queue-3.1/iwlwifi-allow-pci_enable_msi-fail.patch @@ -0,0 +1,47 @@ +From 8a39ef8ba0fa0410d71db8e981e887fe4fdeca88 Mon Sep 17 00:00:00 2001 +From: Wey-Yi Guy +Date: Thu, 27 Oct 2011 17:19:39 -0700 +Subject: iwlwifi: allow pci_enable_msi fail + +From: Wey-Yi Guy + +commit 8a39ef8ba0fa0410d71db8e981e887fe4fdeca88 upstream. + +Continue the init process even fail to enable msi + +out_iounmap is no longer used, remove it + +Reported-by: werner +Tested-by: werner +Signed-off-by: Wey-Yi Guy +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/iwlwifi/iwl-pci.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +--- a/drivers/net/wireless/iwlwifi/iwl-pci.c ++++ b/drivers/net/wireless/iwlwifi/iwl-pci.c +@@ -442,10 +442,9 @@ static int iwl_pci_probe(struct pci_dev + 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 */ +@@ -466,7 +465,6 @@ static int iwl_pci_probe(struct pci_dev + + 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); -- 2.47.3