diff options
| author |   Christophe Ricard <christophe.ricard@gmail.com> | 2014-09-13 10:28:48 +0200 |
|---|---|---|
| committer |   Samuel Ortiz <sameo@linux.intel.com> | 2014-09-24 02:02:23 +0200 |
| commit | fa0daa02fb063ecef39b7d421c3d9c4109381dc2 (patch) | |
| tree | ac2ab17b963525db7a603f2f7d4cd1397211a7a1 /drivers/nfc | |
| parent | NFC: st21nfcb: Fix improper management of -EREMOTEIO error code. (diff) | |
| download | linux-dev-fa0daa02fb063ecef39b7d421c3d9c4109381dc2.tar.xz linux-dev-fa0daa02fb063ecef39b7d421c3d9c4109381dc2.zip | |
NFC: st21nfcb: Fix improper ndlc T2 management
T2 was never started when sending a command.
Start it when sending a command for the first attempt
and stop it once we receive the answer.
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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/nfc/st21nfcb/ndlc.c b/drivers/nfc/st21nfcb/ndlc.c index 83c97c36112b..e7bff8921d11 100644 --- a/drivers/nfc/st21nfcb/ndlc.c +++ b/drivers/nfc/st21nfcb/ndlc.c @@ -112,6 +112,10 @@ static void llt_ndlc_send_queue(struct llt_ndlc *ndlc) ndlc->t1_active = true; mod_timer(&ndlc->t1_timer, time_sent + msecs_to_jiffies(NDLC_TIMER_T1)); + /* start timer t2 for chip availability */ + ndlc->t2_active = true; + mod_timer(&ndlc->t2_timer, time_sent + + msecs_to_jiffies(NDLC_TIMER_T2)); } } @@ -207,7 +211,7 @@ static void llt_ndlc_sm_work(struct work_struct *work) ndlc->t2_active = false; ndlc->t1_active = false; del_timer_sync(&ndlc->t1_timer); - + del_timer_sync(&ndlc->t2_timer); ndlc_close(ndlc); ndlc->hard_fault = -EREMOTEIO; } |