From f22ebc99e426248b515fc6eb3625e168b30aa994 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 14 May 2012 17:38:54 +0200
Subject: [PATCH] --- yaml --- r: 314183 b: refs/heads/master c:
 76762b73693aa7621ae8d3ea5c7efbf74beda0b9 h: refs/heads/master i:   314181:
 d660cf66582463c6a4b0abadbb652cf30c73b9da   314179:
 e5ffe43e228e2a915d3c95a242fdbc481493fa88   314175:
 301f7910f31a87474daaf643cd7126e746ad5107 v: v3

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

diff --git a/[refs] b/[refs]
index 98c7b3693548..bb27426645ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93d7e490b7f4a72b6c7e1dfa475fa3c3e18eb9f1
+refs/heads/master: 76762b73693aa7621ae8d3ea5c7efbf74beda0b9
diff --git a/trunk/net/nfc/llcp/commands.c b/trunk/net/nfc/llcp/commands.c
index 850e5cf79378..b982b5b890d7 100644
--- a/trunk/net/nfc/llcp/commands.c
+++ b/trunk/net/nfc/llcp/commands.c
@@ -51,7 +51,7 @@ static u8 llcp_tlv8(u8 *tlv, u8 type)
 	return tlv[2];
 }
 
-static u8 llcp_tlv16(u8 *tlv, u8 type)
+static u16 llcp_tlv16(u8 *tlv, u8 type)
 {
 	if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]])
 		return 0;
@@ -67,7 +67,7 @@ static u8 llcp_tlv_version(u8 *tlv)
 
 static u16 llcp_tlv_miux(u8 *tlv)
 {
-	return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7f;
+	return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7ff;
 }
 
 static u16 llcp_tlv_wks(u8 *tlv)