summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-12-02 14:00:51 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-12-02 14:00:51 -0500
commit1937721f5637b53c794124cf4fd9edad0eb315ef (patch)
tree011689400fe1b751ad59a54f30158c713f9a64dd /net
parent916448e77f6bcaaa7f13c3de0c3851783ae2bfd0 (diff)
parentbe93112accb42c5586a459683d71975cc70673ca (diff)
downloadlinux-3.10-1937721f5637b53c794124cf4fd9edad0eb315ef.tar.gz
linux-3.10-1937721f5637b53c794124cf4fd9edad0eb315ef.tar.bz2
linux-3.10-1937721f5637b53c794124cf4fd9edad0eb315ef.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/sco.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index d0927d1fdad..66b9e5c0523 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));