[gentoo-commits] linux-patches r2030 - genpatches-2.6/trunk/3.1

[gentoo-commits] linux-patches r2030 - genpatches-2.6/trunk/3.1

[Stratos Psomadakis (psomas)]

Author: psomas
Date: 2011-12-10 10:18:12 +0000 (Sat, 10 Dec 2011)
New Revision: 2030

Removed:
   genpatches-2.6/trunk/3.1/2400_pci-enable-msi-failure-fix.patch
Log:
Patch included in 3.1.5

Deleted: genpatches-2.6/trunk/3.1/2400_pci-enable-msi-failure-fix.patch
===================================================================
--- genpatches-2.6/trunk/3.1/2400_pci-enable-msi-failure-fix.patch	2011-12-10 10:14:31 UTC (rev 2029)
+++ genpatches-2.6/trunk/3.1/2400_pci-enable-msi-failure-fix.patch	2011-12-10 10:18:12 UTC (rev 2030)
@@ -1,47 +0,0 @@
-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: [PATCH] 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>
----
- drivers/net/wireless/iwlwifi/iwl-pci.c |    8 +++-----
- 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 3b6cc66..19cc6a8 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)
- 	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 */
-@@ -469,7 +468,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
- 
- 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);
--- 
-1.7.6.2
-
-