From 06f7ad7a3f6f23174f195427694ead0c42391297 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Fri, 13 May 2011 11:57:08 +0300 Subject: [PATCH] --- yaml --- r: 247651 b: refs/heads/master c: 2c0f24636c80aa09990c507c0cede39add4b4724 h: refs/heads/master i: 247649: 16e860608f21d699c4b3191b15d4d19d002f3305 247647: 56b94d5c0a1a839ad3ff1f0916ceff0275d2c66a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/sdio.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7bea52a13c08..a3b62f425c84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe44870bcdf614e4abb35657c68081cda35ba741 +refs/heads/master: 2c0f24636c80aa09990c507c0cede39add4b4724 diff --git a/trunk/drivers/net/wireless/wl12xx/sdio.c b/trunk/drivers/net/wireless/wl12xx/sdio.c index bcd4ad7ba90d..1298461c45d1 100644 --- a/trunk/drivers/net/wireless/wl12xx/sdio.c +++ b/trunk/drivers/net/wireless/wl12xx/sdio.c @@ -267,6 +267,8 @@ static int __devinit wl1271_probe(struct sdio_func *func, goto out_free; } + enable_irq_wake(wl->irq); + disable_irq(wl->irq); ret = wl1271_init_ieee80211(wl); @@ -303,6 +305,7 @@ static void __devexit wl1271_remove(struct sdio_func *func) pm_runtime_get_noresume(&func->dev); wl1271_unregister_hw(wl); + disable_irq_wake(wl->irq); free_irq(wl->irq, wl); wl1271_free_hw(wl); }