From 0be625b33870badaf990d7d0ebfadf627f3625f4 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Mon, 16 Apr 2012 17:44:00 +0200
Subject: [PATCH] --- yaml --- r: 301035 b: refs/heads/master c:
 1e66eda1d40c9ce3ff38782da066a14e1b88ac50 h: refs/heads/master i:   301033:
 aac2e4ab1b6d51f3681db0835734d821e4a5c01e   301031:
 325da6ced07cc01e0e7091d746baa3ddf9b7c1fd v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/libertas/if_usb.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b5631e1b0404..bbf8d0009085 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9fb6465802c2279ea14cc26eb66d17c133478b1
+refs/heads/master: 1e66eda1d40c9ce3ff38782da066a14e1b88ac50
diff --git a/trunk/drivers/net/wireless/libertas/if_usb.c b/trunk/drivers/net/wireless/libertas/if_usb.c
index 74da5f1ea243..ce4938dec2ca 100644
--- a/trunk/drivers/net/wireless/libertas/if_usb.c
+++ b/trunk/drivers/net/wireless/libertas/if_usb.c
@@ -1128,8 +1128,10 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
 
 	lbs_deb_enter(LBS_DEB_USB);
 
-	if (priv->psstate != PS_STATE_FULL_POWER)
-		return -1;
+	if (priv->psstate != PS_STATE_FULL_POWER) {
+		ret = -1;
+		goto out;
+	}
 
 #ifdef CONFIG_OLPC
 	if (machine_is_olpc()) {