Commit 61969ef8 authored by Kangmin Park's avatar Kangmin Park Committed by Marcel Holtmann
Browse files

Bluetooth: Fix return value in hci_dev_do_close() 



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: default avatarKangmin Park <l4stpr0gr4m@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent f41a4b2b

net/bluetooth/hci_core.c

+4 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -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)