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

Commit e3b679d5 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Update hci_disconnect() to return an error value 



We'll soon use hci_disconnect() from places that are interested to know
whether the hci_send_cmd() really succeeded or not. This patch updates
hci_disconnect() to pass on any error returned from hci_send_cmd().

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 9b7b18ef

include/net/bluetooth/hci_core.h

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ static inline struct hci_conn *hci_conn_hash_lookup_state(struct hci_dev *hdev, 
	return NULL;

}



void hci_disconnect(struct hci_conn *conn, __u8 reason);

int hci_disconnect(struct hci_conn *conn, __u8 reason);

bool hci_setup_sync(struct hci_conn *conn, __u16 handle);

void hci_sco_setup(struct hci_conn *conn, __u8 status);

net/bluetooth/hci_conn.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void hci_reject_sco(struct hci_conn *conn) 
	hci_send_cmd(conn->hdev, HCI_OP_REJECT_SYNC_CONN_REQ, sizeof(cp), &cp);

}



void hci_disconnect(struct hci_conn *conn, __u8 reason)

int hci_disconnect(struct hci_conn *conn, __u8 reason)

{

	struct hci_cp_disconnect cp;
@@ -132,7 +132,7 @@ void hci_disconnect(struct hci_conn *conn, __u8 reason) 


	cp.handle = cpu_to_le16(conn->handle);

	cp.reason = reason;

	hci_send_cmd(conn->hdev, HCI_OP_DISCONNECT, sizeof(cp), &cp);

	return hci_send_cmd(conn->hdev, HCI_OP_DISCONNECT, sizeof(cp), &cp);

}



static void hci_amp_disconn(struct hci_conn *conn)