diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2015-06-06 13:16:49 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-06-09 00:34:25 +0200 |
| commit | e8b72c205e5e02b6574be1e83c0c8c99335f8288 (patch) | |
| tree | 010b3e76e4768863c3b9817c6cbf6e888610d38c /drivers/nfc | |
| parent | 0e70cba71f8b61e0a0c7df526f5cee2d842ee93c (diff) | |
| download | linux-stable-e8b72c205e5e02b6574be1e83c0c8c99335f8288.tar.gz linux-stable-e8b72c205e5e02b6574be1e83c0c8c99335f8288.tar.bz2 linux-stable-e8b72c205e5e02b6574be1e83c0c8c99335f8288.zip | |
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: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st21nfcb/ndlc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/st21nfcb/ndlc.c b/drivers/nfc/st21nfcb/ndlc.c index 6014b5859465..429cf055d532 100644 --- a/drivers/nfc/st21nfcb/ndlc.c +++ b/drivers/nfc/st21nfcb/ndlc.c @@ -286,6 +286,8 @@ EXPORT_SYMBOL(ndlc_probe); void ndlc_remove(struct llt_ndlc *ndlc) { + st21nfcb_nci_remove(ndlc->ndev); + /* cancel timers */ del_timer_sync(&ndlc->t1_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->send_q); - - st21nfcb_nci_remove(ndlc->ndev); } EXPORT_SYMBOL(ndlc_remove); |