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

Commit 74559447 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "bluetooth: delete retransmit timer after ibs workqueue destructs"

parents 3540fada 46cbddc3

drivers/bluetooth/hci_ibs.c

+6 −6
Original line number Diff line number Diff line
@@ -517,18 +517,18 @@ static int ibs_close(struct hci_uart *hu) 


	skb_queue_purge(&ibs->tx_wait_q);

	skb_queue_purge(&ibs->txq);

	del_timer(&ibs->tx_idle_timer);

	del_timer(&ibs->wake_retrans_timer);



	del_timer_sync(&ibs->tx_idle_timer);

	destroy_workqueue(ibs->workqueue);

	del_timer_sync(&ibs->wake_retrans_timer);



	__ibs_msm_serial_clock_request_off(hu->tty);

	ibs_msm_serial_clock_vote(HCI_IBS_VOTE_STATS_UPDATE, hu);

	ibs_log_local_stats(ibs);

	destroy_workqueue(ibs->workqueue);

	ibs->ibs_hu = NULL;



	ibs->ibs_hu = NULL;

	kfree_skb(ibs->rx_skb);



	hu->priv = NULL;



	kfree(ibs);



	return 0;