From 990af4a35ef84ccce3f228cadef5a7ce950463f2 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Sun, 27 Jan 2013 00:31:30 +0200
Subject: [PATCH] --- yaml --- r: 352339 b: refs/heads/master c:
 056341c8cb677356eb2c20a82e788ccb51c6a37b h: refs/heads/master i:   352337:
 426f94987f2446ef32b8e6bd888fbbcadef0671d   352335:
 5df43400d250dfb5831b8437d5e3c3b46f1838aa v: v3

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

diff --git a/[refs] b/[refs]
index df5217dd4474..470428b265b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83be8eca2e67faaec45280224b798828bbfa69aa
+refs/heads/master: 056341c8cb677356eb2c20a82e788ccb51c6a37b
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 8de6d576dc70..1e906d8d86ac 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -1372,7 +1372,7 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,
 {
 	struct mgmt_cp_remove_uuid *cp = data;
 	struct pending_cmd *cmd;
-	struct list_head *p, *n;
+	struct bt_uuid *match, *tmp;
 	u8 bt_uuid_any[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	int err, found;
 
@@ -1400,9 +1400,7 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,
 
 	found = 0;
 
-	list_for_each_safe(p, n, &hdev->uuids) {
-		struct bt_uuid *match = list_entry(p, struct bt_uuid, list);
-
+	list_for_each_entry_safe(match, tmp, &hdev->uuids, list) {
 		if (memcmp(match->uuid, cp->uuid, 16) != 0)
 			continue;