projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
06ed3d6
)
NFC: st21nfca: Change nfcid3 generation
author
Christophe Ricard
<
[email protected]
>
Sun, 10 Aug 2014 22:04:52 +0000
(
00:04
+0200)
committer
Samuel Ortiz
<
[email protected]
>
Sun, 7 Sep 2014 22:04:21 +0000
(
00:04
+0200)
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 <
[email protected]
>
Signed-off-by: Samuel Ortiz <
[email protected]
>
drivers/nfc/st21nfca/st21nfca_dep.c
patch
|
blob
|
history
diff --git
a/drivers/nfc/st21nfca/st21nfca_dep.c
b/drivers/nfc/st21nfca/st21nfca_dep.c
index a62b6485cbbe31eff6627db2693dba8e314ee2d1..cd942c5adc53def786da308cf514d2dfdfc36191 100644
(file)
--- a/
drivers/nfc/st21nfca/st21nfca_dep.c
+++ b/
drivers/nfc/st21nfca/st21nfca_dep.c
@@
-523,7
+523,7
@@
int st21nfca_im_send_atr_req(struct nfc_hci_dev *hdev, u8 *gb, size_t gb_len)
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