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

Commit 2d4524ac authored by John W. Linville's avatar John W. Linville
Browse files

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

parents 463454b5 ddcd0f41

net/bluetooth/af_bluetooth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -210,7 +210,7 @@ struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock) 
		}

		}





		if (sk->sk_state == BT_CONNECTED || !newsock ||

		if (sk->sk_state == BT_CONNECTED || !newsock ||

		    test_bit(BT_DEFER_SETUP, &bt_sk(parent)->flags)) {

		    test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags)) {

			bt_accept_unlink(sk);

			bt_accept_unlink(sk);

			if (newsock)

			if (newsock)

				sock_graft(sk, newsock);

				sock_graft(sk, newsock);