projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
net
/
bluetooth
/
sco.c
diff --git
a/net/bluetooth/sco.c
b/net/bluetooth/sco.c
index
688a040
..
f315c8d
100644
(file)
--- a/
net/bluetooth/sco.c
+++ b/
net/bluetooth/sco.c
@@
-154,13
+154,13
@@
static void sco_chan_del(struct sock *sk, int err)
sock_set_flag(sk, SOCK_ZAPPED);
}
sock_set_flag(sk, SOCK_ZAPPED);
}
-static
int
sco_conn_del(struct hci_conn *hcon, int err)
+static
void
sco_conn_del(struct hci_conn *hcon, int err)
{
struct sco_conn *conn = hcon->sco_data;
struct sock *sk;
if (!conn)
{
struct sco_conn *conn = hcon->sco_data;
struct sock *sk;
if (!conn)
- return
0
;
+ return;
BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);
BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);
@@
-179,7
+179,6
@@
static int sco_conn_del(struct hci_conn *hcon, int err)
hcon->sco_data = NULL;
kfree(conn);
hcon->sco_data = NULL;
kfree(conn);
- return 0;
}
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent)
}
static void __sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent)