2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/wireless/wl1251/sdio.c b/drivers/net/wireless/wl1251/sdio.c
index 85a710182a8..4cf5c2e201d 100644
--- a/drivers/net/wireless/wl1251/sdio.c
+++ b/drivers/net/wireless/wl1251/sdio.c
@@ -259,6 +259,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
         }
 
         if (wl->irq) {
+                irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
                 ret = request_irq(wl->irq, wl1251_line_irq, 0, "wl1251", wl);
                 if (ret < 0) {
                         wl1251_error("request_irq() failed: %d", ret);
@@ -266,7 +267,6 @@ static int wl1251_sdio_probe(struct sdio_func *func,
                 }
 
                 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
-                disable_irq(wl->irq);
 
                 wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
                 wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
diff --git a/drivers/net/wireless/wl1251/spi.c b/drivers/net/wireless/wl1251/spi.c
index af6448c4d3e..49f3651423d 100644
--- a/drivers/net/wireless/wl1251/spi.c
+++ b/drivers/net/wireless/wl1251/spi.c
@@ -280,6 +280,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
 
         wl->use_eeprom = pdata->use_eeprom;
 
+        irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
         ret = request_irq(wl->irq, wl1251_irq, 0, DRIVER_NAME, wl);
         if (ret < 0) {
                 wl1251_error("request_irq() failed: %d", ret);
@@ -288,8 +289,6 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)
 
         irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
 
-        disable_irq(wl->irq);
-
         ret = wl1251_init_ieee80211(wl);
         if (ret)
                 goto out_irq;