Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4993e0d2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

parents 4c2a1b86 d793fe8c

net/bluetooth/l2cap.c

+2 −2
Original line number Diff line number Diff line
@@ -2891,7 +2891,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd 
	struct l2cap_chan_list *list = &conn->chan_list;

	struct l2cap_conn_req *req = (struct l2cap_conn_req *) data;

	struct l2cap_conn_rsp rsp;

	struct sock *parent, *uninitialized_var(sk);

	struct sock *parent, *sk = NULL;

	int result, status = L2CAP_CS_NO_INFO;



	u16 dcid = 0, scid = __le16_to_cpu(req->scid);
@@ -3000,7 +3000,7 @@ static inline int l2cap_connect_req(struct l2cap_conn *conn, struct l2cap_cmd_hd 
					L2CAP_INFO_REQ, sizeof(info), &info);

	}



	if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT) &&

	if (sk && !(l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT) &&

				result == L2CAP_CR_SUCCESS) {

		u8 buf[128];

		l2cap_pi(sk)->conf_state |= L2CAP_CONF_REQ_SENT;