From 4f62068a33e28ee7bfae399f6bc8c045f61212be Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Tue, 12 Jun 2012 00:47:58 +0200
Subject: [PATCH] --- yaml --- r: 311617 b: refs/heads/master c:
 03e934f620101ca2cfc9383bd76172dd3e1f8567 h: refs/heads/master i:   311615:
 bb74b3c2efebcf640b4b0a362d932dbd36b9bbbf v: v3

---
 [refs]                  | 2 +-
 trunk/net/nfc/rawsock.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6df47d708d52..37b109d262fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67de956ff5dc1d4f321e16cfbd63f5be3b691b43
+refs/heads/master: 03e934f620101ca2cfc9383bd76172dd3e1f8567
diff --git a/trunk/net/nfc/rawsock.c b/trunk/net/nfc/rawsock.c
index ec1134c9e07f..8b8a6a2b2bad 100644
--- a/trunk/net/nfc/rawsock.c
+++ b/trunk/net/nfc/rawsock.c
@@ -54,7 +54,10 @@ static int rawsock_release(struct socket *sock)
 {
 	struct sock *sk = sock->sk;
 
-	pr_debug("sock=%p\n", sock);
+	pr_debug("sock=%p sk=%p\n", sock, sk);
+
+	if (!sk)
+		return 0;
 
 	sock_orphan(sk);
 	sock_put(sk);