From f6277383b5d9aaf83778274aa83156ec37b4694e Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Fri, 13 Nov 2009 14:16:32 -0800
Subject: [PATCH] --- yaml --- r: 180415 b: refs/heads/master c:
 c390216b3e868b16d8154939f4b6f8c16dbd9a9f h: refs/heads/master i:   180413:
 0185a70f95340ab8e906f7bdee520a1dc0fab66d   180411:
 74447f5c69ead3002d2b612ce469b091c1812526   180407:
 18ee0bb15fe44ffd4ff5e5a69e74cd4e8eb3e91a   180399:
 c23d9133294d0b885d5e48ce2eb4956bcc10f6a2   180383:
 748641e9b97b4d9416dc887edbe75c606f4f0c02   180351:
 46a63357cbaff0c621c2c9269499981826b46d42 v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_conn.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e1dc8c73fb01..402059edd408 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88d1a0cf659438a66135661538ae332b23f8635a
+refs/heads/master: c390216b3e868b16d8154939f4b6f8c16dbd9a9f
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index b7c4224f4e7d..b10e3cdb08f8 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -377,6 +377,9 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8
 
 	if (acl->state == BT_CONNECTED &&
 			(sco->state == BT_OPEN || sco->state == BT_CLOSED)) {
+		acl->power_save = 1;
+		hci_conn_enter_active_mode(acl);
+
 		if (lmp_esco_capable(hdev))
 			hci_setup_sync(sco, acl->handle);
 		else