---

yaml --- r: 247651 b: refs/heads/master c: 2c0f246 h: refs/heads/master i: 247649: 16e8606 247647: 56b94d5 v: v3
git-mirror · May 13, 2011 · 06f7ad7 · 06f7ad7
1 parent 4e3037a
commit 06f7ad7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);
 }