3.1 patches

added patches:
	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 (file)
index 0000000..3577c26
--- /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 <wey-yi.w.guy@intel.com>
+Date: Thu, 27 Oct 2011 17:19:39 -0700
+Subject: iwlwifi: allow pci_enable_msi fail
+
+From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
+
+commit 8a39ef8ba0fa0410d71db8e981e887fe4fdeca88 upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ 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);