From 6f5fdc6e6aa1aa3b6a76aa6093603b08d27001f7 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Wed, 27 Jul 2011 17:19:00 +0100
Subject: [PATCH] --- yaml --- r: 265411 b: refs/heads/master c:
 dfb72c4fda54b11efe0afbb4e4081af1dfa4c14f h: refs/heads/master i:   265409:
 713c09852c8ef8450bea35411d35ccdfd5dbc13d   265407:
 1abebf85a30441c580d1da449b1f12f3931f108b v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/libertas/if_usb.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c27589a537bb..9f7c9562d5d7 100644
--- 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
index e368b2922ff1..ca6e0a411e9c 100644
--- 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;