---

yaml --- r: 352242 b: refs/heads/master c: a1d7045 h: refs/heads/master v: v3
git-mirror · Jan 10, 2013 · 49b6af4 · 49b6af4
1 parent 219cb7d
commit 49b6af4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 		}
 	}