From 49b6af4c9db56d89ebfdd6584404d62ce88d4232 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 9 Jan 2013 15:29:40 +0200
Subject: [PATCH] --- yaml --- r: 352242 b: refs/heads/master c:
 a1d704509d5b96756d3d4cfb7f10a555efeadb87 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ef600998b2d5..e5a7ca8bcb5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04106755763f558886a631338d12546345bae6e9
+refs/heads/master: a1d704509d5b96756d3d4cfb7f10a555efeadb87
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index b1b0a36e1e80..37add53ce613 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -787,8 +787,9 @@ static int set_powered(struct sock *sk, struct hci_dev *hdev, void *data,
 		cancel_delayed_work(&hdev->power_off);
 
 		if (cp->val) {
-			err = send_settings_rsp(sk, MGMT_OP_SET_POWERED, hdev);
-			mgmt_powered(hdev, 1);
+			mgmt_pending_add(sk, MGMT_OP_SET_POWERED, hdev,
+					 data, len);
+			err = mgmt_powered(hdev, 1);
 			goto failed;
 		}
 	}