From 069ba23ea9ce912f6d7c6270c14403f70126238e Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 8 Oct 2012 08:43:45 +0800
Subject: [PATCH] --- yaml --- r: 337119 b: refs/heads/master c:
 605fba82a2d6f8e19b7530805b792487562429a7 h: refs/heads/master i:   337117:
 1a3096fb8161fd0599d43eb7ef3e2a8189fa0bd7   337115:
 b20df3e30ec25918667304b474b0388f9ff8e3c9   337111:
 6871d3b80d3b7a97e2f3f4f7f8d5871b95258fe7   337103:
 1d6d4cec9bb42666355714854d5a0d9a34288a2a   337087:
 779650b07bffed6bb58f85460144981934e941a2 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7ad1e3ae00d3..bace0d0b51d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5e0f69c983a142daa95b70f709a3dabf76cb55f
+refs/heads/master: 605fba82a2d6f8e19b7530805b792487562429a7
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index c9a6a7fbb89c..3a6479064519 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -2110,10 +2110,10 @@ static int r871x_wps_start(struct net_device *dev,
 	struct iw_point *pdata = &wrqu->data;
 	u32   u32wps_start = 0;
 
-	if (copy_from_user((void *)&u32wps_start, pdata->pointer, 4))
-		return -EFAULT;
 	if ((padapter->bDriverStopped) || (pdata == NULL))
 		return -EINVAL;
+	if (copy_from_user((void *)&u32wps_start, pdata->pointer, 4))
+		return -EFAULT;
 	if (u32wps_start == 0)
 		u32wps_start = *extra;
 	if (u32wps_start == 1) /* WPS Start */