Commit 324b0af6 authored Apr 10, 2012 by Samuel Ortiz Committed by John W. Linville Apr 12, 2012

NFC: Fix LLCP TLV building routine



The if logic could lead to zero length TLVs.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 279cf174

net/nfc/llcp/commands.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;