diff --git a/[refs] b/[refs]
index e719e123e1f1..ca74d0c26258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60a5711db646b87b9530b16cbaf3bd53ac5594a5
+refs/heads/master: d23380701876dd93d310b2548c51d0f78f25d7aa
diff --git a/trunk/drivers/net/tehuti.c b/trunk/drivers/net/tehuti.c
index 20ab16192325..737df6032bbc 100644
--- a/trunk/drivers/net/tehuti.c
+++ b/trunk/drivers/net/tehuti.c
@@ -646,7 +646,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
 		error = copy_from_user(data, ifr->ifr_data, sizeof(data));
 		if (error) {
 			pr_err("cant copy from user\n");
-			RET(error);
+			RET(-EFAULT);
 		}
 		DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]);
 	}
@@ -665,7 +665,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
 		    data[2]);
 		error = copy_to_user(ifr->ifr_data, data, sizeof(data));
 		if (error)
-			RET(error);
+			RET(-EFAULT);
 		break;
 
 	case BDX_OP_WRITE: