diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-08-18 13:33:32 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-09-08 13:07:55 -0400 |
commit | e3b679d56caa2bc555dee646a6ac5861631e7a28 (patch) | |
tree | 3b3d8063e8610516015028160b3fed08d551be7a /net/bluetooth | |
parent | 9b7b18ef1bea82e5fc1e05da386ff57b0f60f651 (diff) |
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_conn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 5157a0990732..dd2df20b0f7d 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -122,7 +122,7 @@ static void hci_reject_sco(struct hci_conn *conn) | |||
122 | hci_send_cmd(conn->hdev, HCI_OP_REJECT_SYNC_CONN_REQ, sizeof(cp), &cp); | 122 | hci_send_cmd(conn->hdev, HCI_OP_REJECT_SYNC_CONN_REQ, sizeof(cp), &cp); |
123 | } | 123 | } |
124 | 124 | ||
125 | void hci_disconnect(struct hci_conn *conn, __u8 reason) | 125 | int hci_disconnect(struct hci_conn *conn, __u8 reason) |
126 | { | 126 | { |
127 | struct hci_cp_disconnect cp; | 127 | struct hci_cp_disconnect cp; |
128 | 128 | ||
@@ -132,7 +132,7 @@ void hci_disconnect(struct hci_conn *conn, __u8 reason) | |||
132 | 132 | ||
133 | cp.handle = cpu_to_le16(conn->handle); | 133 | cp.handle = cpu_to_le16(conn->handle); |
134 | cp.reason = reason; | 134 | cp.reason = reason; |
135 | hci_send_cmd(conn->hdev, HCI_OP_DISCONNECT, sizeof(cp), &cp); | 135 | return hci_send_cmd(conn->hdev, HCI_OP_DISCONNECT, sizeof(cp), &cp); |
136 | } | 136 | } |
137 | 137 | ||
138 | static void hci_amp_disconn(struct hci_conn *conn) | 138 | static void hci_amp_disconn(struct hci_conn *conn) |