summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2010-11-10 15:45:07 -0800
committerJaikumar Ganesh <jaikumar@google.com>2010-11-10 15:58:24 -0800
commitdfa196f0e99696d22a4329ea3494175740904a26 (patch)
tree9e45cc0c85048d5146e2ba6230bbe9a97e1f0c27
parentaa8f9fcdc8ba8d5e9e238ba83a072d2122c05f6e (diff)
Revert "Bluetooth: Hack: Do not use power_save feature."
This reverts commit 3b02c046c3dfef5b5c4fa0c45b69654c107c7403. Signed-off-by: Jaikumar Ganesh<jaikumar@google.com>
-rw-r--r--net/bluetooth/hci_conn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 1c8c30d52b53..aabe0c3d4829 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -540,7 +540,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)) {