diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-01-09 16:05:36 +0530 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-01-09 21:57:37 +0000 |
| commit | 6c6391f55805236ff8f8201ac42e0eb59f03f89f (patch) | |
| tree | 6f06dcbda4425c6e26ec8a5de3ee23e73bc242e4 | |
| parent | c9f923316ac7a8d1fc1fc0e7bb7937a828e5ec33 (diff) | |
Add deleted code during 3.8 linaro-android mergetracking-linaro-android-3.8-llct-20130115.0tracking-linaro-android-3.8-llct-20130114.0
Fix up mismerge.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: John Stultz <jstultz@nisse.canonical.com>
| -rwxr-xr-x | net/bluetooth/hci_event.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 4b9f55837f0c..8e57b29dbd1a 100755 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2047,6 +2047,15 @@ unlock: hci_conn_check_pending(hdev); } +static inline bool is_sco_active(struct hci_dev *hdev) +{ + if (hci_conn_hash_lookup_state(hdev, SCO_LINK, BT_CONNECTED) || + (hci_conn_hash_lookup_state(hdev, ESCO_LINK, + BT_CONNECTED))) + return true; + return false; +} + void hci_conn_accept(struct hci_conn *conn, int mask) { struct hci_dev *hdev = conn->hdev; |