From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:32:24 +0000 (+0800)
Subject: Revert "Bluetooth: Hack: Do not use power_save feature."
X-Git-Tag: firefly_0821_release~9959
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f28223cebded434a59a363bace779c7f2f23f42;p=firefly-linux-kernel-4.4.55.git

Revert "Bluetooth: Hack: Do not use power_save feature."

This reverts commit c09426ea439387637204ccebafd6cd7f02065e62.
---

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index fa8b412205cd..0cf25114a3f5 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -500,7 +500,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn)
 	if (test_bit(HCI_RAW, &hdev->flags))
 		return;
 
-	if (conn->mode != HCI_CM_SNIFF /* || !conn->power_save */)
+	if (conn->mode != HCI_CM_SNIFF || !conn->power_save)
 		goto timer;
 
 	if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {