From 85177c966ed3b296d5eafb9c922eae03c58a6108 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Wed, 22 Feb 2012 12:06:43 +0100
Subject: [PATCH] --- yaml --- r: 291023 b: refs/heads/master c:
 70c1f20b00495fd25b81be14b263d32648a3d629 h: refs/heads/master i:   291021:
 d8e92e38219d7882860dc78e39e0bac346bb4463   291019:
 648b6612c2d768b83f9e6c529bf6131967039266   291015:
 90c83ae20fb39b3909f8676beab08f5d28e81ef4   291007:
 b070bd77b985dabb701fd28e19750cb5d196ed93 v: v3

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

diff --git a/[refs] b/[refs]
index 55dec28b3467..2acecb957a6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5f0e151426bd83e4852a7a150fc6ad8ee349e69
+refs/heads/master: 70c1f20b00495fd25b81be14b263d32648a3d629
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index 3c68e606d5e5..947172bf1621 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -402,7 +402,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst)
 
 	skb_queue_head_init(&conn->data_q);
 
-	INIT_LIST_HEAD(&conn->chan_list);;
+	INIT_LIST_HEAD(&conn->chan_list);
 
 	INIT_DELAYED_WORK(&conn->disc_work, hci_conn_timeout);
 	setup_timer(&conn->idle_timer, hci_conn_idle, (unsigned long)conn);
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index 9d199494bd65..e1dadeea4c2f 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -1957,7 +1957,7 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
 
 	while (count) {
 		scb = (void *) skb->cb;
-		len = min(scb->expect, (__u16)count);
+		len = min_t(__u16, scb->expect, count);
 
 		memcpy(skb_put(skb, len), data, len);