Bluetooth: Make the function sco_conn_del have a return type of void (df945360) · Commits · 戴 / test

This makes the function sco_conn_del have a return type of void now due to this function always running successfully and thus never needing to signal its caller when a non recoverable internal failure occurs by returning a error code to its respective caller. Signed-off-by:

Nicholas Krause <xerofoify@gmail.com> Signed-off-by:

Marcel Holtmann <marcel@holtmann.org>

net/bluetooth/sco.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -154,13 +154,13 @@ static void sco_chan_del(struct sock *sk, int err)
		sock_set_flag(sk, SOCK_ZAPPED);
		}

		static int sco_conn_del(struct hci_conn *hcon, int err)
		static void sco_conn_del(struct hci_conn *hcon, int err)
		{
		struct sco_conn *conn = hcon->sco_data;
		struct sock *sk;

		if (!conn)
		return 0;
		return;

		BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);

		@@ -179,7 +179,6 @@ static int sco_conn_del(struct hci_conn *hcon, int err)

		hcon->sco_data = NULL;
		kfree(conn);
		return 0;
		}

		static void __sco_chan_add(struct sco_conn conn, struct sock sk, struct sock *parent)

Admin message