commit 72030a2eeb182575f1bf2383f1e9267d4a6ece61
author Christophe Ricard <christophe.ricard@gmail.com> Mon Aug 11 00:04:52 2014 +0200
committer Samuel Ortiz <sameo@linux.intel.com> Mon Sep 08 00:04:21 2014 +0200
tree 5ec80d22b3ab497a06d05ada659e5ec3872875ce
parent 06ed3d607b1030365e6f4bdae193e64378e4264b

NFC: st21nfca: Change nfcid3 generation

nfcid3 is based on sensf_res value. target->sensf is never NULL
as it is a table.
Check the sensf_res_len instead to make sure sensf_res is set or not.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

drivers/nfc/st21nfca/st21nfca_dep.c

diff --git a/drivers/nfc/st21nfca/st21nfca_dep.c b/drivers/nfc/st21nfca/st21nfca_dep.c
index a62b648..cd942c5 100644
--- a/drivers/nfc/st21nfca/st21nfca_dep.c
+++ b/drivers/nfc/st21nfca/st21nfca_dep.c
@@ -523,7 +523,7 @@
 	memset(atr_req->nfcid3, 0, NFC_NFCID3_MAXSIZE);
 	target = hdev->ndev->targets;
 
-	if (target->sensf_res)
+	if (target->sensf_res_len > 0)
 		memcpy(atr_req->nfcid3, target->sensf_res,
 				target->sensf_res_len);
 	else