---

yaml --- r: 30410 b: refs/heads/master c: a3b0a5a h: refs/heads/master v: v3
git-mirror · Jun 26, 2006 · 1ee434b · 1ee434b
1 parent c273f11
commit 1ee434b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b087b28a629cc9388e42fdccdcd929deaa7ac81
+refs/heads/master: a3b0a5a9d004002a9cf9cf7a9d10cf1447a73d2b
diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c
@@ -969,7 +969,7 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
 restart:
 	if (unlikely((skb_queue_len(&sock->sk->sk_receive_queue) == 0) &&
 		     (flags & MSG_DONTWAIT))) {
-		res = (sz_copied == 0) ? -EWOULDBLOCK : 0;
+		res = -EWOULDBLOCK;
 		goto exit;
 	}
 
@@ -1060,7 +1060,7 @@ static int recv_stream(struct kiocb *iocb, struct socket *sock,
 
 exit:
 	up(&tsock->sem);
-	return res ? res : sz_copied;
+	return sz_copied ? sz_copied : res;
 }
 
 /**