summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Escande <thierry.escande@collabora.com>2016-06-16 20:24:45 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2016-07-06 10:26:52 +0200
commit3cc952dbf1a7176b9247da4cd2612c9ddc1d1b51 (patch)
tree4e8fe70f1d101239c3097ada1fad408de2127f76
parentNFC: digital: Set the command pending flag (diff)
downloadlinux-3cc952dbf1a7176b9247da4cd2612c9ddc1d1b51.tar.xz
linux-3cc952dbf1a7176b9247da4cd2612c9ddc1d1b51.zip
NFC: digital: Abort last command when dep link goes down
With this patch, the Digital Protocol layer abort the last issued command when the dep link goes down. That way it does not have to wait for the driver to reply with a timeout error before sending a new command (i.e. a start poll command if constant polling is on). Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--net/nfc/digital_core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/nfc/digital_core.c b/net/nfc/digital_core.c
index 0146e42ee28f..0fd5518bf252 100644
--- a/net/nfc/digital_core.c
+++ b/net/nfc/digital_core.c
@@ -612,6 +612,8 @@ static int digital_dep_link_down(struct nfc_dev *nfc_dev)
{
struct nfc_digital_dev *ddev = nfc_get_drvdata(nfc_dev);
+ digital_abort_cmd(ddev);
+
ddev->curr_protocol = 0;
return 0;