Merge branch 'x86/defconfig' into x86/mce2

[linux-2.6-omap-h63xx.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index f3a0d08cbb48389c67d36bafcf49fce1c0ace1ab..6f2e1337975de8e09b079339f2c2819caddfa8ea 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -696,6 +696,8 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
        if (len < 0)
                return -EINVAL;
 
+       v.val = 0;
+
        switch(optname) {
        case SO_DEBUG:
                v.val = sock_flag(sk, SOCK_DBG);