diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-12-01 21:04:09 -0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-12-01 21:04:09 -0200 |
| commit | 17f490bcedd7b6677140b2d49efe9e9e6b84de60 (patch) | |
| tree | c0e26c4e3d4fa186d097a6b94952e0d322644b8b /net | |
| parent | 61790c5f3c5f158821821a00797d94504531839f (diff) | |
| parent | be93112accb42c5586a459683d71975cc70673ca (diff) | |
| download | op-kernel-dev-17f490bcedd7b6677140b2d49efe9e9e6b84de60.zip op-kernel-dev-17f490bcedd7b6677140b2d49efe9e9e6b84de60.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/sco.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index d0927d1..66b9e5c 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -882,7 +882,7 @@ static int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type) int lm = 0; if (type != SCO_LINK && type != ESCO_LINK) - return 0; + return -EINVAL; BT_DBG("hdev %s, bdaddr %s", hdev->name, batostr(bdaddr)); @@ -908,7 +908,7 @@ static int sco_connect_cfm(struct hci_conn *hcon, __u8 status) BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status); if (hcon->type != SCO_LINK && hcon->type != ESCO_LINK) - return 0; + return -EINVAL; if (!status) { struct sco_conn *conn; @@ -927,7 +927,7 @@ static int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason) BT_DBG("hcon %p reason %d", hcon, reason); if (hcon->type != SCO_LINK && hcon->type != ESCO_LINK) - return 0; + return -EINVAL; sco_conn_del(hcon, bt_err(reason)); |
