summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorMark Greer <mgreer@animalcreek.com>2017-06-16 05:34:21 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2017-11-10 00:03:39 +0100
commit72ad533acc22870156736c2fef4674c01307695e (patch)
treea110f638dae7a99c089157e65b2368e9269a5ed5 /net/nfc
parentNFC: Convert timers to use timer_setup() (diff)
downloadlinux-72ad533acc22870156736c2fef4674c01307695e.tar.xz
linux-72ad533acc22870156736c2fef4674c01307695e.zip
NFC: digital: Abort cmd when deactivating target
When deactivating an active target, the outstanding command should be aborted. Signed-off-by: Mark Greer <mgreer@animalcreek.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/digital_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/nfc/digital_core.c b/net/nfc/digital_core.c
index de6dd37d04c7..ec0a8998e52d 100644
--- a/net/nfc/digital_core.c
+++ b/net/nfc/digital_core.c
@@ -650,6 +650,7 @@ static void digital_deactivate_target(struct nfc_dev *nfc_dev,
return;
}
+ digital_abort_cmd(ddev);
ddev->curr_protocol = 0;
}