diff --git a/[refs] b/[refs]
index b98a7c1c27ad..db1da881a0aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4135c2da11c337e3759f98727c4819ba2a849fa
+refs/heads/master: f249fb783092471a4808e5fc5bda071d2724810d
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index d9eec153d531..bbb25be7ddfe 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -631,7 +631,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
 
 	case SO_TIMESTAMPING:
 		if (val & ~SOF_TIMESTAMPING_MASK) {
-			ret = EINVAL;
+			ret = -EINVAL;
 			break;
 		}
 		sock_valbool_flag(sk, SOCK_TIMESTAMPING_TX_HARDWARE,