Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux-beck.git] / net / unix / diag.c

diff --git a/net/unix/diag.c b/net/unix/diag.c
index 86fa0f3b2cafa46d47db9cd03e46dfe89c22d238..ef542fbca9fe52dd85f6946e9d65ee8a28f6340e 100644 (file)
--- a/net/unix/diag.c
+++ b/net/unix/diag.c
@@ -155,7 +155,8 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r
        if (nla_put_u8(skb, UNIX_DIAG_SHUTDOWN, sk->sk_shutdown))
                goto out_nlmsg_trim;
 
-       return nlmsg_end(skb, nlh);
+       nlmsg_end(skb, nlh);
+       return 0;
 
 out_nlmsg_trim:
        nlmsg_cancel(skb, nlh);