[kernel] r16271 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Sep 12 23:07:28 2010
New Revision: 16271

Log:
hostap_pci: set dev->base_addr during probe (Closes: #595802)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/hostap_pci-set-dev-base_addr-during-probe.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/22

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Sep 12 22:14:10 2010	(r16270)
+++ dists/sid/linux-2.6/debian/changelog	Sun Sep 12 23:07:28 2010	(r16271)
@@ -54,6 +54,7 @@
   * ipheth: add support for iPhone 4
   * ipheth: remove incorrect devtype of WWAN
   * ALSA: emux: Add trivial compat ioctl handler (Closes: #596478)
+  * hostap_pci: set dev->base_addr during probe (Closes: #595802)
 
   [ Bastian Blank ]
   * Use Breaks instead of Conflicts.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/hostap_pci-set-dev-base_addr-during-probe.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/hostap_pci-set-dev-base_addr-during-probe.patch	Sun Sep 12 23:07:28 2010	(r16271)
@@ -0,0 +1,33 @@
+From: John W. Linville <linville at tuxdriver.com>
+Date: Tue, 13 Jul 2010 14:06:32 -0400
+Subject: [PATCH] hostap_pci: set dev->base_addr during probe
+
+commit 0f4da2d77e1bf424ac36424081afc22cbfc3ff2b upstream.
+
+"hostap: Protect against initialization interrupt" (which reinstated
+"wireless: hostap, fix oops due to early probing interrupt")
+reintroduced Bug 16111.  This is because hostap_pci wasn't setting
+dev->base_addr, which is now checked in prism2_interrupt.  As a result,
+initialization was failing for PCI-based hostap devices.  This corrects
+that oversight.
+
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/hostap/hostap_pci.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
+index d24dc7d..972a9c3 100644
+--- a/drivers/net/wireless/hostap/hostap_pci.c
++++ b/drivers/net/wireless/hostap/hostap_pci.c
+@@ -330,6 +330,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,
+ 
+         dev->irq = pdev->irq;
+         hw_priv->mem_start = mem;
++	dev->base_addr = (unsigned long) mem;
+ 
+ 	prism2_pci_cor_sreset(local);
+ 
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Sun Sep 12 22:14:10 2010	(r16270)
+++ dists/sid/linux-2.6/debian/patches/series/22	Sun Sep 12 23:07:28 2010	(r16271)
@@ -124,3 +124,4 @@
 + features/all/ipheth-add-support-for-iPhone-4.patch
 + bugfix/all/ipheth-remove-incorrect-devtype-to-WWAN.patch
 + bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch
++ bugfix/all/hostap_pci-set-dev-base_addr-during-probe.patch