From 164c682903e7ee929794db702ce8b46f7e5b9ede Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 28 Feb 2012 09:57:59 +0300
Subject: [PATCH] --- yaml --- r: 291074 b: refs/heads/master c:
 89bb46d02046b59c1de3d2e92680f3a1062750d0 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f8b719a9cf9b..3ce01cce6b01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3379013bcfceb3c0365a3cf03543d6c67b84fc34
+refs/heads/master: 89bb46d02046b59c1de3d2e92680f3a1062750d0
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index e6cbb8a1f47d..db484a8e7364 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -1966,7 +1966,7 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
 
 	while (count) {
 		scb = (void *) skb->cb;
-		len = min_t(__u16, scb->expect, count);
+		len = min_t(uint, scb->expect, count);
 
 		memcpy(skb_put(skb, len), data, len);