From 49ad5f5c0c75e93834c3c6529bd1517b4022ccde Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 31 Jan 2013 11:16:46 +0300
Subject: [PATCH] --- yaml --- r: 352575 b: refs/heads/master c:
 e9a4aa3ba386c8a368baaadde6f9e5c3d5f17cfe h: refs/heads/master i:   352573:
 9c16cec13fc936ec96ca58c2dbdca336472c9c5d   352571:
 e6f8a10b4a617d9db1673dd676a01a3098ee44da   352567:
 c6f329a5d9f3c055ff31dca2300e0444b96dd9d7   352559:
 2447415d4ec015433438fa42a07d08b60f611bae   352543:
 67c57d8f680fc0b10085e95d24c7fdc552c0e4a6   352511:
 b38dfb9b2fd0a58f80af963c13211da48413a680 v: v3

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

diff --git a/[refs] b/[refs]
index 2bfb6c54edb7..69b8bcfd3b87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d3b2046e310b361da93fe6c44bde5522c782da
+refs/heads/master: e9a4aa3ba386c8a368baaadde6f9e5c3d5f17cfe
diff --git a/trunk/net/nfc/llcp/llcp.c b/trunk/net/nfc/llcp/llcp.c
index 85bc75c38dea..746f5a2f9804 100644
--- a/trunk/net/nfc/llcp/llcp.c
+++ b/trunk/net/nfc/llcp/llcp.c
@@ -549,14 +549,13 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len)
 		pr_err("No LLCP device\n");
 		return -ENODEV;
 	}
+	if (gb_len < 3)
+		return -EINVAL;
 
 	memset(local->remote_gb, 0, NFC_MAX_GT_LEN);
 	memcpy(local->remote_gb, gb, gb_len);
 	local->remote_gb_len = gb_len;
 
-	if (local->remote_gb == NULL || local->remote_gb_len == 0)
-		return -ENODEV;
-
 	if (memcmp(local->remote_gb, llcp_magic, 3)) {
 		pr_err("MAC does not support LLCP\n");
 		return -EINVAL;