Skip to content

Commit

Permalink
Bluetooth: Fix return value in hci_dev_do_close()
Browse files Browse the repository at this point in the history
hci_error_reset() return without calling hci_dev_do_open() when
hci_dev_do_close() return error value which is not 0.

Also, hci_dev_close() return hci_dev_do_close() function's return
value.

But, hci_dev_do_close() return always 0 even if hdev->shutdown
return error value. So, fix hci_dev_do_close() to save and return
the return value of the hdev->shutdown when it is called.

Signed-off-by: Kangmin Park <l4stpr0gr4m@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Kangmin Park authored and Marcel Holtmann committed Aug 19, 2021
1 parent f41a4b2 commit 61969ef
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1724,6 +1724,7 @@ static void hci_pend_le_actions_clear(struct hci_dev *hdev)
int hci_dev_do_close(struct hci_dev *hdev)
{
bool auto_off;
int err = 0;

BT_DBG("%s %p", hdev->name, hdev);

Expand All @@ -1738,13 +1739,13 @@ int hci_dev_do_close(struct hci_dev *hdev)
test_bit(HCI_UP, &hdev->flags)) {
/* Execute vendor specific shutdown routine */
if (hdev->shutdown)
hdev->shutdown(hdev);
err = hdev->shutdown(hdev);
}

if (!test_and_clear_bit(HCI_UP, &hdev->flags)) {
cancel_delayed_work_sync(&hdev->cmd_timer);
hci_req_sync_unlock(hdev);
return 0;
return err;
}

hci_leds_update_powered(hdev, false);
Expand Down Expand Up @@ -1851,7 +1852,7 @@ int hci_dev_do_close(struct hci_dev *hdev)
hci_req_sync_unlock(hdev);

hci_dev_put(hdev);
return 0;
return err;
}

int hci_dev_close(__u16 dev)
Expand Down

0 comments on commit 61969ef

Please sign in to comment.