From 45c0c362a7f63f22d5b4c685ad5ece2fb141ba6f Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 16 Nov 2011 09:32:22 +0100 Subject: [PATCH] --- yaml --- r: 278581 b: refs/heads/master c: 250938cb370351fb603e1d47292377421bb029b2 h: refs/heads/master i: 278579: dd57d376b1b73418fc8c5177ff0c33ecee6c73fb v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_core.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a7656a80a626..ae8a017ab469 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1726b6dc95b5ed0914e969f6765a9e2cf7baf04 +refs/heads/master: 250938cb370351fb603e1d47292377421bb029b2 diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index 26925a8f8ead..7c746ec85143 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -154,12 +154,9 @@ static struct l2cap_chan *__l2cap_global_chan_by_addr(__le16 psm, bdaddr_t *src) list_for_each_entry(c, &chan_list, global_l) { if (c->sport == psm && !bacmp(&bt_sk(c->sk)->src, src)) - goto found; + return c; } - - c = NULL; -found: - return c; + return NULL; } int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm)