diff options
| author | Christophe Ricard <christophe.ricard@gmail.com> | 2014-08-11 00:04:52 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-09-08 00:04:21 +0200 |
| commit | 72030a2eeb182575f1bf2383f1e9267d4a6ece61 (patch) | |
| tree | 5ec80d22b3ab497a06d05ada659e5ec3872875ce /drivers/nfc | |
| parent | NFC: st21nfca: Remove useless new line in nfc_err call (diff) | |
| download | linux-72030a2eeb182575f1bf2383f1e9267d4a6ece61.tar.xz linux-72030a2eeb182575f1bf2383f1e9267d4a6ece61.zip | |
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>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st21nfca/st21nfca_dep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/st21nfca/st21nfca_dep.c b/drivers/nfc/st21nfca/st21nfca_dep.c index a62b6485cbbe..cd942c5adc53 100644 --- 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 |