X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fnfc%2Frawsock.c;h=0d570d304da224df3d65591695a454946ccc442b;hb=f098a0c6d8ae69c9c4f8788c7157ecbb55eafa26;hp=9fd652a51424bc88fb0a3a9bad7fc8e120418c4f;hpb=c125d5e846894043361c0c89c1140be8fd6600b7;p=pandora-kernel.git

diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index 9fd652a51424..0d570d304da2 100644
--- a/net/nfc/rawsock.c
+++ b/net/nfc/rawsock.c
@@ -23,6 +23,7 @@
 
 #include <net/tcp_states.h>
 #include <linux/nfc.h>
+#include <linux/export.h>
 
 #include "nfc.h"
 
@@ -51,7 +52,10 @@ static int rawsock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
 
-	nfc_dbg("sock=%p", sock);
+	nfc_dbg("sock=%p sk=%p", sock, sk);
+
+	if (!sk)
+		return 0;
 
 	sock_orphan(sk);
 	sock_put(sk);
@@ -244,8 +248,6 @@ static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock,
 	if (!skb)
 		return rc;
 
-	msg->msg_namelen = 0;
-
 	copied = skb->len;
 	if (len < copied) {
 		msg->msg_flags |= MSG_TRUNC;