diff --git a/[refs] b/[refs]
index 671fb60dca71..46322f0edec0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c60e55f30a4dac15db51b398c3bd94e4cfbf743a
+refs/heads/master: 2d98bb22c33b033182edd3a3c6b4c4e1d091db4d
diff --git a/trunk/drivers/staging/rt2860/sta_ioctl.c b/trunk/drivers/staging/rt2860/sta_ioctl.c
index 112da7a6c417..6b8268d3dc75 100644
--- a/trunk/drivers/staging/rt2860/sta_ioctl.c
+++ b/trunk/drivers/staging/rt2860/sta_ioctl.c
@@ -2522,6 +2522,8 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev,
 			Status =
 			    copy_to_user(erq->pointer, pAd->nickname,
 					 erq->length);
+			if (Status)
+				Status = -EFAULT;
 			break;
 		}
 	case SIOCGIWRATE:	/*get default bit rate (bps) */