Revert "nfc: hci: shdlc: Stop timers and work before freeing context" This reverts commit c60f41022eaad2a1dafecd3ae6f249a3bd6d4b6e which is commit c9efde1e537baed7648a94022b43836a348a074f upstream. It breaks the Android kernel build and can be brought back in the future in a safe way if it is really needed. Bug: 161946584 Change-Id: I28eda9e1d6639ae33114782586faec029919042e Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c index 948cf4d..aef750d 100644 --- a/net/nfc/hci/llc_shdlc.c +++ b/net/nfc/hci/llc_shdlc.c
@@ -779,14 +779,6 @@ static void llc_shdlc_deinit(struct nfc_llc *llc) { struct llc_shdlc *shdlc = nfc_llc_get_data(llc); - timer_shutdown_sync(&shdlc->connect_timer); - timer_shutdown_sync(&shdlc->t1_timer); - timer_shutdown_sync(&shdlc->t2_timer); - shdlc->t1_active = false; - shdlc->t2_active = false; - - cancel_work_sync(&shdlc->sm_work); - skb_queue_purge(&shdlc->rcv_q); skb_queue_purge(&shdlc->send_q); skb_queue_purge(&shdlc->ack_pending_q);