diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-12 11:06:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-12 11:06:59 -0800 |
| commit | ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78 (patch) | |
| tree | e25d01c62a4c7f3de78675faa6728b54848304e2 /net/bluetooth/sco.c | |
| parent | 70d279a7e2a6e308530822ba2bf4134cc0f5c091 (diff) | |
| parent | 409ec36c320d580a036045e603f96286c362c609 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/bluetooth/sco.c')
| -rw-r--r-- | net/bluetooth/sco.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index c9348ddda87..42fdffd1d76 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -190,20 +190,21 @@ static int sco_connect(struct sock *sk) hci_dev_lock_bh(hdev); - err = -ENOMEM; - if (lmp_esco_capable(hdev) && !disable_esco) type = ESCO_LINK; else type = SCO_LINK; hcon = hci_connect(hdev, type, dst, BT_SECURITY_LOW, HCI_AT_NO_BONDING); - if (!hcon) + if (IS_ERR(hcon)) { + err = PTR_ERR(hcon); goto done; + } conn = sco_conn_add(hcon, 0); if (!conn) { hci_conn_put(hcon); + err = -ENOMEM; goto done; } |