From e32dd0799a4cc8be6925c61201e95b6f89380f03 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 25 May 2007 21:59:29 -0400
Subject: [PATCH] --- yaml --- r: 57664 b: refs/heads/master c:
 94b23855c034ffa50e1f94f43ef4500520e4c36e h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/libertas/ioctl.c | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 393705643dee..f0cea6f26394 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cfb00823872d0181c5c72c2d457de93518d96e7
+refs/heads/master: 94b23855c034ffa50e1f94f43ef4500520e4c36e
diff --git a/trunk/drivers/net/wireless/libertas/ioctl.c b/trunk/drivers/net/wireless/libertas/ioctl.c
index cfb4752b3bce..a59d26ba6c70 100644
--- a/trunk/drivers/net/wireless/libertas/ioctl.c
+++ b/trunk/drivers/net/wireless/libertas/ioctl.c
@@ -603,12 +603,14 @@ static int wlan_fwt_list_ioctl(wlan_private * priv, struct ifreq *req)
 	char *ptr = in_str;
 	static char out_str[128];
 	char *pbuf = out_str;
-	int ret;
+	int ret = 0;
 
 	lbs_deb_enter(LBS_DEB_IOCTL);
 
-	if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str)))
-		return -EFAULT;
+	if (copy_from_user(in_str, wrq->u.data.pointer, sizeof(in_str))) {
+		ret = -EFAULT;
+		goto out;
+	}
 
 	fwt_access.id = cpu_to_le32(simple_strtoul(ptr, &ptr, 10));
 
@@ -632,11 +634,15 @@ static int wlan_fwt_list_ioctl(wlan_private * priv, struct ifreq *req)
 	if (copy_to_user(wrq->u.data.pointer, (char *)out_str,
 			 wrq->u.data.length)) {
 		lbs_deb_ioctl("FWT_LIST: Copy to user failed!\n");
-		return -EFAULT;
+		ret = -EFAULT;
+		goto out;
 	}
 
+	ret = 0;
+
+out:
 	lbs_deb_leave(LBS_DEB_IOCTL);
-	return 0;
+	return ret;
 }
 
 /**