---

yaml --- r: 265411 b: refs/heads/master c: dfb72c4 h: refs/heads/master i: 265409: 713c098 265407: 1abebf8 v: v3
git-mirror · Aug 8, 2011 · 6f5fdc6 · 6f5fdc6
1 parent 50b5208
commit 6f5fdc6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c204b46c7af93e334114bea1f5eeaa6fea9ba07
+refs/heads/master: dfb72c4fda54b11efe0afbb4e4081af1dfa4c14f
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c
@@ -1112,6 +1112,15 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
 	if (priv->psstate != PS_STATE_FULL_POWER)
 		return -1;
 
+#ifdef CONFIG_OLPC
+	if (machine_is_olpc()) {
+		if (priv->wol_criteria == EHS_REMOVE_WAKEUP)
+			olpc_ec_wakeup_clear(EC_SCI_SRC_WLAN);
+		else
+			olpc_ec_wakeup_set(EC_SCI_SRC_WLAN);
+	}
+#endif
+
 	ret = lbs_suspend(priv);
 	if (ret)
 		goto out;