4 files changed, 15 insertions, 15 deletions

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index c9640a3e02c9..d19748d90aaf 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -794,13 +794,6 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
         PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
                                     0x7a954bd9, 0x74be00c6),
         PCMCIA_DEVICE_PROD_ID123(
-                "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
-                0x4b801a17, 0x6345a0bf, 0xc9049a39),
-        /* D-Link DWL-650 Rev. P1; manfid 0x000b, 0x7110 */
-        PCMCIA_DEVICE_PROD_ID123(
-                "D-Link", "DWL-650 Wireless PC Card RevP", "ISL37101P-10",
-                0x1a424a1c, 0x6ea57632, 0xdd97a26b),
-        PCMCIA_DEVICE_PROD_ID123(
                 "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
                 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
         PCMCIA_DEVICE_PROD_ID123(
@@ -834,14 +827,12 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
                 "Ver. 1.00",
                 0x5cd01705, 0x4271660f, 0x9d08ee12),
         PCMCIA_DEVICE_PROD_ID123(
-                "corega", "WL PCCL-11", "ISL37300P",
-                0xa21501a, 0x59868926, 0xc9049a39),
-        PCMCIA_DEVICE_PROD_ID123(
-                "The Linksys Group, Inc.", "Wireless Network CF Card", "ISL37300P",
-                0xa5f472c2, 0x9c05598d, 0xc9049a39),
-        PCMCIA_DEVICE_PROD_ID123(
                 "Wireless LAN" , "11Mbps PC Card", "Version 01.02",
                 0x4b8870ff, 0x70e946d1, 0x4b74baa0),
+        PCMCIA_DEVICE_PROD_ID3("HFA3863", 0x355cb092),
+        PCMCIA_DEVICE_PROD_ID3("ISL37100P", 0x630d52b2),
+        PCMCIA_DEVICE_PROD_ID3("ISL37101P-10", 0xdd97a26b),
+        PCMCIA_DEVICE_PROD_ID3("ISL37300P", 0xc9049a39),
         PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index ff9b5c882184..d70732819423 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -2618,6 +2618,15 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
         int events = 0;
         u16 ev;
 
+        /* Detect early interrupt before driver is fully configued */
+        if (!dev->base_addr) {
+                if (net_ratelimit()) {
+                        printk(KERN_DEBUG "%s: Interrupt, but dev not configured\n",
+                               dev->name);
+                }
+                return IRQ_HANDLED;
+        }
+
         iface = netdev_priv(dev);
         local = iface->local;
 
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 8fdd41f4b4f2..4d97ae37499b 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -39,7 +39,7 @@ struct hostap_pci_priv {
 /* FIX: do we need mb/wmb/rmb with memory operations? */
 
 
-static struct pci_device_id prism2_pci_id_table[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(prism2_pci_id_table) = {
         /* Intersil Prism3 ISL3872 11Mb/s WLAN Controller */
         { 0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID },
         /* Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller */
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index 0e5d51086a44..fc04ccdc5bef 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -60,7 +60,7 @@ struct hostap_plx_priv {
 
 #define PLXDEV(vendor,dev,str) { vendor, dev, PCI_ANY_ID, PCI_ANY_ID }
 
-static struct pci_device_id prism2_plx_id_table[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(prism2_plx_id_table) = {
         PLXDEV(0x10b7, 0x7770, "3Com AirConnect PCI 777A"),
         PLXDEV(0x111a, 0x1023, "Siemens SpeedStream SS1023"),
         PLXDEV(0x126c, 0x8030, "Nortel emobility"),