Commit e8b72c20 authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz

NFC: st21nfcb: Move st21nfcb_nci_remove in ndlc_remove

Removing st21nfcb may need to execute some specific commands before
stopping the ndlc state machine.
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 0e70cba7
...@@ -286,6 +286,8 @@ EXPORT_SYMBOL(ndlc_probe); ...@@ -286,6 +286,8 @@ EXPORT_SYMBOL(ndlc_probe);
void ndlc_remove(struct llt_ndlc *ndlc) void ndlc_remove(struct llt_ndlc *ndlc)
{ {
st21nfcb_nci_remove(ndlc->ndev);
/* cancel timers */ /* cancel timers */
del_timer_sync(&ndlc->t1_timer); del_timer_sync(&ndlc->t1_timer);
del_timer_sync(&ndlc->t2_timer); del_timer_sync(&ndlc->t2_timer);
...@@ -294,7 +296,5 @@ void ndlc_remove(struct llt_ndlc *ndlc) ...@@ -294,7 +296,5 @@ void ndlc_remove(struct llt_ndlc *ndlc)
skb_queue_purge(&ndlc->rcv_q); skb_queue_purge(&ndlc->rcv_q);
skb_queue_purge(&ndlc->send_q); skb_queue_purge(&ndlc->send_q);
st21nfcb_nci_remove(ndlc->ndev);
} }
EXPORT_SYMBOL(ndlc_remove); EXPORT_SYMBOL(ndlc_remove);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment