diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-21 03:54:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-21 03:54:29 -0400 |
| commit | 4993e0d211105bc72d4ffc62ba20232d25ad418a (patch) | |
| tree | 3f8fc881711a00061001280f903c6b0ed2a7cad7 /net | |
| parent | 4c2a1b86644a6f3fc6b788d3a591563aff71f836 (diff) | |
| parent | d793fe8caa3911e6a1e826b45d4ee00d250cdec8 (diff) | |
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/l2cap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 0b54b7dd8401..dc6020570a32 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
| @@ -2891,7 +2891,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd | |||
| 2891 | struct l2cap_chan_list *list = &conn->chan_list; | 2891 | struct l2cap_chan_list *list = &conn->chan_list; |
| 2892 | struct l2cap_conn_req *req = (struct l2cap_conn_req *) data; | 2892 | struct l2cap_conn_req *req = (struct l2cap_conn_req *) data; |
| 2893 | struct l2cap_conn_rsp rsp; | 2893 | struct l2cap_conn_rsp rsp; |
| 2894 | struct sock *parent, *uninitialized_var(sk); | 2894 | struct sock *parent, *sk = NULL; |
| 2895 | int result, status = L2CAP_CS_NO_INFO; | 2895 | int result, status = L2CAP_CS_NO_INFO; |
| 2896 | 2896 | ||
| 2897 | u16 dcid = 0, scid = __le16_to_cpu(req->scid); | 2897 | u16 dcid = 0, scid = __le16_to_cpu(req->scid); |
| @@ -3000,7 +3000,7 @@ sendresp: | |||
| 3000 | L2CAP_INFO_REQ, sizeof(info), &info); | 3000 | L2CAP_INFO_REQ, sizeof(info), &info); |
| 3001 | } | 3001 | } |
| 3002 | 3002 | ||
| 3003 | if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT) && | 3003 | if (sk && !(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT) && |
| 3004 | result == L2CAP_CR_SUCCESS) { | 3004 | result == L2CAP_CR_SUCCESS) { |
| 3005 | u8 buf[128]; | 3005 | u8 buf[128]; |
| 3006 | l2cap_pi(sk)->conf_state |= L2CAP_CONF_REQ_SENT; | 3006 | l2cap_pi(sk)->conf_state |= L2CAP_CONF_REQ_SENT; |