diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-08 22:45:56 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-08 22:45:56 -0800 |
| commit | 44bfce5c3ec91baf8ffcd075c66711740f29a949 (patch) | |
| tree | f11621b66679902ecc84434f987d50c3609f0194 /net/bluetooth/hci_conn.c | |
| parent | bcf4d812e66ee95f762b38063d654fd1ff7156b0 (diff) | |
| parent | 15c697ce1c5b408c5e20dcdc6aea2968d1125b75 (diff) | |
| download | linux-44bfce5c3ec91baf8ffcd075c66711740f29a949.tar.gz linux-44bfce5c3ec91baf8ffcd075c66711740f29a949.tar.bz2 linux-44bfce5c3ec91baf8ffcd075c66711740f29a949.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index b7c4224f4e7d..b10e3cdb08f8 100644 --- a/net/bluetooth/hci_conn.c +++ b/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 |