From bd5303acbc318dc3ff6c6e0c55bc10680bd1468c Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 10 Apr 2012 19:43:15 +0200
Subject: [PATCH] --- yaml --- r: 300881 b: refs/heads/master c:
 324b0af6f5a48dc38dac016eed14d019cac5903f h: refs/heads/master i:   300879:
 1bc01e7dc0c8d52529b0e452af835985cce362d8 v: v3

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

diff --git a/[refs] b/[refs]
index 5f42c512142b..0c43fd4d0005 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 279cf174aea84202c5fef4675ff3f1265f071c8e
+refs/heads/master: 324b0af6f5a48dc38dac016eed14d019cac5903f
diff --git a/trunk/net/nfc/llcp/commands.c b/trunk/net/nfc/llcp/commands.c
index 4aa52b8b6c0c..34ee6847806a 100644
--- a/trunk/net/nfc/llcp/commands.c
+++ b/trunk/net/nfc/llcp/commands.c
@@ -102,7 +102,7 @@ u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length)
 	length = llcp_tlv_length[type];
 	if (length == 0 && value_length == 0)
 		return NULL;
-	else
+	else if (length == 0)
 		length = value_length;
 
 	*tlv_length = 2 + length;