diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-05-30 10:32:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-30 10:32:16 -0400 |
| commit | a0f68763e1c7dd57fa2dae3c07bc50651e2eac29 (patch) | |
| tree | f3a8fc40b3f0e6eb4a8579bb799c143a62f2c354 /drivers/net/wireless/ti/wl1251/sdio.c | |
| parent | 3fdcbd453152329002f12dfda0be90b714458164 (diff) | |
| parent | 7b21aea04d084916ac4e0e8852dcc9cd60ec0d1d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/ti/wl1251/sdio.c')
| -rw-r--r-- | drivers/net/wireless/ti/wl1251/sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c index 1b851f650e07..e2750a12c6f1 100644 --- a/drivers/net/wireless/ti/wl1251/sdio.c +++ b/drivers/net/wireless/ti/wl1251/sdio.c @@ -260,6 +260,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); @@ -267,7 +268,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; |