From 405b96c29cf01725ad084b83fde45caedb9ec640 Mon Sep 17 00:00:00 2001
From: Syam Sidhardhan <syamsidhardh@gmail.com>
Date: Thu, 16 Aug 2012 00:55:43 +0530
Subject: [PATCH] --- yaml --- r: 328267 b: refs/heads/master c:
 5db327f96daa2401b9afec6cd80cebe6c6475bb1 h: refs/heads/master i:   328265:
 92f5010d88ca889b6ead049703ebc80039b8b8dc   328263:
 41c083ff2294e7f736f1a09f936f598db7d85451 v: v3

---
 [refs]                    | 2 +-
 trunk/net/nfc/llcp/sock.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c1a299c617c6..0c24c2ac48ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 058576ddfb31762bfce70086a3c12678a97c4d75
+refs/heads/master: 5db327f96daa2401b9afec6cd80cebe6c6475bb1
diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c
index ddeb9aa398f0..6e188d4020ba 100644
--- a/trunk/net/nfc/llcp/sock.c
+++ b/trunk/net/nfc/llcp/sock.c
@@ -300,9 +300,6 @@ static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr,
 	pr_debug("%p %d %d %d\n", sk, llcp_sock->target_idx,
 		 llcp_sock->dsap, llcp_sock->ssap);
 
-	if (llcp_sock == NULL || llcp_sock->dev == NULL)
-		return -EBADFD;
-
 	uaddr->sa_family = AF_NFC;
 
 	*len = sizeof(struct sockaddr_nfc_llcp);