leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFC: st21nfcb: Move st21nfcb_nci_remove in ndlc_remove

Browse Source 
Removing st21nfcb may need to execute some specific commands before
stopping the ndlc state machine.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Christophe Ricard 2015-06-06 13:16:49 +02:00 committed by Samuel Ortiz
parent 0e70cba71f
commit e8b72c205e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nfc/st21nfcb/ndlc.c
View File

@ -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)
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);