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>

diff --git a/drivers/nfc/st21nfcb/ndlc.c b/drivers/nfc/st21nfcb/ndlc.c
index 83c97c36112bc7bb9e42d952fb18b8e42d8fed82..e7bff8921d1143876246c90955649181af573dce 100644 (file)
--- 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;
        }