From dd58a85617850eba9cc45a532184f58f429e3794 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 23 Feb 2012 21:33:16 +0200
Subject: [PATCH] --- yaml --- r: 291057 b: refs/heads/master c:
 9246a8693e74b3480913cf6e0c2d472267169990 h: refs/heads/master i:   291055:
 528e4570dad9f6977d74cb9720ff52e2dd6c7a26 v: v3

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

diff --git a/[refs] b/[refs]
index 48b9d29404a5..0c1d91cbf905 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4004b6d96a14edbd157a62ae25bf61022d7caccc
+refs/heads/master: 9246a8693e74b3480913cf6e0c2d472267169990
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 30a30b7b301c..93f2c1348add 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -1401,7 +1401,7 @@ static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
 			schedule_delayed_work(&hdev->service_cache,
 					msecs_to_jiffies(SERVICE_CACHE_TIMEOUT));
 
-		goto unlock;
+		goto update_class;
 	}
 
 	found = 0;
@@ -1422,6 +1422,7 @@ static int remove_uuid(struct sock *sk, u16 index, void *data, u16 len)
 		goto unlock;
 	}
 
+update_class:
 	err = update_class(hdev);
 	if (err < 0)
 		goto unlock;