From b36624c0bcb936b46dd1fc60632c21836f29297b Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Fri, 14 Jan 2011 00:18:49 +0100
Subject: [PATCH] --- yaml --- r: 237301 b: refs/heads/master c:
 b2c60d42db0fea1e6c4345739601024863566a13 h: refs/heads/master i:   237299:
 93dc8be5d1a3ef9dfb518a018ea348c3cb0d27fe v: v3

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

diff --git a/[refs] b/[refs]
index 01ec1df301af..08cade893450 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80f5585a292d087856cbc1ddc64d4f7477244b46
+refs/heads/master: b2c60d42db0fea1e6c4345739601024863566a13
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index f827fd908380..ace872615c06 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -111,8 +111,10 @@ static int read_index_list(struct sock *sk)
 
 	body_len = sizeof(*ev) + sizeof(*rp) + (2 * count);
 	skb = alloc_skb(sizeof(*hdr) + body_len, GFP_ATOMIC);
-	if (!skb)
+	if (!skb) {
+		read_unlock(&hci_dev_list_lock);
 		return -ENOMEM;
+	}
 
 	hdr = (void *) skb_put(skb, sizeof(*hdr));
 	hdr->opcode = cpu_to_le16(MGMT_EV_CMD_COMPLETE);