aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@tieto.com>2011-11-16 03:32:21 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-16 15:30:21 -0500
commit1ec918cef5ced016edb95c357e45e656e4e156b1 (patch)
tree621f11f21ff7ea72f0a9b73d85ddb2fee30ad602 /net/bluetooth/l2cap_core.c
parent250938cb370351fb603e1d47292377421bb029b2 (diff)
Bluetooth: Fix some checkpatch.pl errors and warnings
Signed-off-by: Szymon Janc <szymon.janc@tieto.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 7c746ec85143..d63e67007c6b 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -97,7 +97,6 @@ static struct l2cap_chan *__l2cap_get_chan_by_dcid(struct l2cap_conn *conn, u16
97 return c; 97 return c;
98 } 98 }
99 return NULL; 99 return NULL;
100
101} 100}
102 101
103static struct l2cap_chan *__l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 cid) 102static struct l2cap_chan *__l2cap_get_chan_by_scid(struct l2cap_conn *conn, u16 cid)
@@ -1901,7 +1900,7 @@ static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan)
1901{ 1900{
1902 struct l2cap_conf_efs efs; 1901 struct l2cap_conf_efs efs;
1903 1902
1904 switch(chan->mode) { 1903 switch (chan->mode) {
1905 case L2CAP_MODE_ERTM: 1904 case L2CAP_MODE_ERTM:
1906 efs.id = chan->local_id; 1905 efs.id = chan->local_id;
1907 efs.stype = chan->local_stype; 1906 efs.stype = chan->local_stype;
@@ -3014,7 +3013,7 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, struct l2cap_cmd
3014 3013
3015 /* don't delete l2cap channel if sk is owned by user */ 3014 /* don't delete l2cap channel if sk is owned by user */
3016 if (sock_owned_by_user(sk)) { 3015 if (sock_owned_by_user(sk)) {
3017 l2cap_state_change(chan,BT_DISCONN); 3016 l2cap_state_change(chan, BT_DISCONN);
3018 __clear_chan_timer(chan); 3017 __clear_chan_timer(chan);
3019 __set_chan_timer(chan, L2CAP_DISC_TIMEOUT); 3018 __set_chan_timer(chan, L2CAP_DISC_TIMEOUT);
3020 bh_unlock_sock(sk); 3019 bh_unlock_sock(sk);