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

Commit 519e42b3 authored by Lukasz Rymanowski's avatar Lukasz Rymanowski Committed by Gustavo Padovan
Browse files

Bluetooth: Remove not needed status parameter 



Sco_conn_add is called from two places and always with status = 0.

Signed-off-by: default avatarLukasz Rymanowski <lukasz.rymanowski@tieto.com>
Signed-off-by: default avatarGustavo Padovan <gustavo@padovan.org>
parent 7d5d775a

net/bluetooth/sco.c

+4 −4
Original line number Diff line number Diff line
@@ -93,12 +93,12 @@ static void sco_sock_clear_timer(struct sock *sk) 
}



/* ---- SCO connections ---- */

static struct sco_conn *sco_conn_add(struct hci_conn *hcon, __u8 status)

static struct sco_conn *sco_conn_add(struct hci_conn *hcon)

{

	struct hci_dev *hdev = hcon->hdev;

	struct sco_conn *conn = hcon->sco_data;



	if (conn || status)

	if (conn)

		return conn;



	conn = kzalloc(sizeof(struct sco_conn), GFP_ATOMIC);
@@ -199,7 +199,7 @@ static int sco_connect(struct sock *sk) 
		goto done;

	}



	conn = sco_conn_add(hcon, 0);

	conn = sco_conn_add(hcon);

	if (!conn) {

		hci_conn_put(hcon);

		err = -ENOMEM;
@@ -924,7 +924,7 @@ int sco_connect_cfm(struct hci_conn *hcon, __u8 status) 
	if (!status) {

		struct sco_conn *conn;



		conn = sco_conn_add(hcon, status);

		conn = sco_conn_add(hcon);

		if (conn)

			sco_conn_ready(conn);

	} else