linux-stable.git/drivers/nfc, branch v4.7.7

NFC: fdp: Detect errors from fdp_nci_create_conn()

2016-10-07T13:21:23+00:00

commit fa1ce54ea38f7f83473fce62e64fefbd7ebd170e upstream.

drivers/nfc/fdp/fdp.c: In function ‘fdp_nci_patch_otp’:
drivers/nfc/fdp/fdp.c:373: warning: comparison is always false due to limited range of data type
drivers/nfc/fdp/fdp.c: In function ‘fdp_nci_patch_ram’:
drivers/nfc/fdp/fdp.c:444: warning: comparison is always false due to limited range of data type

fdp_nci_create_conn() may return a negative error code, which is
silently ignored by assigning it to a u8.

Change conn_id from u8 to int to fix this.

Fixes: a06347c04c13e380 ("NFC: Add Intel Fields Peak NFC solution driver")
Signed-off-by: Geert Uytterhoeven 
Signed-off-by: Samuel Ortiz 
Signed-off-by: Greg Kroah-Hartman

NFC: pn533: handle interrupted commands in pn533_recv_frame

2016-05-09T22:01:47+00:00

When pn533_recv_frame is called from within abort_command
context the current  dev->cmd is not guaranteed to be set.

Additionally on receiving an error status we can omit frame
checking and simply schedule the workqueue.

Signed-off-by: Michael Thalmeier 
Signed-off-by: Samuel Ortiz

NFC: pn533: reset poll modulation list before calling targets_found

2016-05-09T22:01:16+00:00

We need to reset the poll modulation list before calling
nfc_targets_found because otherwise userspace could run
before the modulation list is cleared and then get a "Cannot
activate target while polling" error upon calling activate_target.

Signed-off-by: Michael Thalmeier 
Signed-off-by: Samuel Ortiz

NFC: pn533: i2c: do not call pn533_recv_frame with aborted commands

2016-05-09T21:59:47+00:00

When a command gets aborted the pn533 core does not need any RX
frames that may be received until a new frame is sent.

Signed-off-by: Michael Thalmeier 
Signed-off-by: Samuel Ortiz

NFC: pn533: fix order of initialization

2016-05-09T21:59:18+00:00

Correctly call nfc_set_parent_dev before nfc_register_device.
Otherwise the driver will OOPS when being removed.

Signed-off-by: Michael Thalmeier 
Signed-off-by: Samuel Ortiz

NFC: pn533: i2c: free irq on driver remove

2016-05-09T21:56:23+00:00

The requested irq needs to be freed when removing the driver,
otherwise a following driver load fails to request the irq.

Signed-off-by: Michael Thalmeier 
Signed-off-by: Samuel Ortiz

nfc: st-nci: Move loopback usage from HCI to NCI

2016-05-03T23:51:42+00:00

NCI provides possible way to run loopback testing has done over HCI.

For us it offers many advantages:
- It simplifies the code: No more need for a vendor_cmds structure
- Loopback over HCI may not be supported in future st-nci firmware

Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz

nfc: nci: Add an additional parameter to identify a connection id

2016-05-03T23:43:21+00:00

According to NCI specification, destination type and destination
specific parameters shall uniquely identify a single destination
for the Logical Connection.

Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz

nfc: st21nfca: Remove duplicated ST21NFCA_ESE_HOST_ID from se.c

2016-05-03T23:40:28+00:00

ST21NFCA_ESE_HOST_ID is already defined in st21nfca.h.

Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz

nfc: st-nci: Remove redundant ST_NCI_HCI_HOST_ID_ESE from st-nci.h

2016-05-03T23:39:36+00:00

ST_NCI_HCI_HOST_ID_ESE is already having an equivalent in se.c
(ST_NCI_ESE_HOST_ID).

Remove and replace where relevant.

Signed-off-by: Christophe Ricard 
Signed-off-by: Samuel Ortiz