From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:32:29 +0000 (+0800)
Subject: Revert "Bluetooth: Enter active mode before establishing a SCO link."
X-Git-Tag: firefly_0821_release~9956
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5e12fdae417d0f0363c9d9eb1ebad47f88e741cf;p=firefly-linux-kernel-4.4.55.git

Revert "Bluetooth: Enter active mode before establishing a SCO link."

This reverts commit 8fd3238575a5410507846838dbb2d4553f3f5aa2.
---

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index b10e3cdb08f8..b7c4224f4e7d 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -377,9 +377,6 @@ 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