user/sven/linux.git/drivers/nfc, branch v4.1.37

NFC: st21nfca: fix use of uninitialized variables in error path

2015-09-29T17:25:55Z

commit 5a3570061a131309143a49e4bbdbce7e23f261e7 upstream. st21nfca_hci_load_session() calls kfree_skb() on unitialized variables skb_pipe_info and skb_pipe_list if the call to nfc_hci_connect_gate() failed. Reword the error path to not use these variables when they are not initialized. While at it, there seemed to be a memory leak because skb_pipe_info was only freed once, after the for-loop, even though several ones were created by nfc_hci_send_cmd. Fixes: ec03ff1a8f9a ("NFC: st21nfca: Remove skb_pipe_list and skb_pipe_info useless allocation") Acked-by: Christophe Ricard Signed-off-by: Nicolas Iooss Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman

NFC: st21nfcb: remove st21nfcb_nci_i2c_disable

2015-08-03T16:29:01Z

commit 4ac82e894825126816d7b7f662743335ce2b015e upstream. ndlc_remove already calls st21nfcb_nci_i2c_disable and phy->powered is already set to 0. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman

NFC: st21nfcb: Do not remove header once the payload is sent

2015-08-03T16:29:01Z

commit 09f39a950523b1bb830c30a8670b77e0067da092 upstream. Once the data is sent, we need to preserve the full frame for the ndlc state machine. If the NDLC ACK is not received in time, the ndlc layer will resend the same frame. Having the header byte pulled will corrupt the frame. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman

NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer

2015-08-03T16:29:00Z

commit 38bd83f04c5e9695011dc5c294e0c4e6a9f9052d upstream. Since ndev->driver_data is allocated by devm_kzalloc(), we do not need the inappropriate kfree to free it in driver's remove function. Freeing will trigger when driver unloads. Acked-by: Christophe Ricard Signed-off-by: Firo Yang Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman

NFC: logging neatening

2015-04-07T10:05:12Z

Add missing terminating newlines to nfc_info and nfc_err to avoid possible interleaving from other messages. Miscellanea: o typo fix of "unknonwn" in message o remove unnecessary OOM messages as there's a generic dump_stack() o realign arguments Signed-off-by: Joe Perches Signed-off-by: Samuel Ortiz

NFC: pn533: fix error return code

2015-04-05T23:22:17Z

Return a negative error code on failure. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ identifier ret; expression e1,e2; @@ ( if (\(ret < 0\|ret != 0\)) { ... return ret; } | ret = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // Signed-off-by: Julia Lawall Signed-off-by: Samuel Ortiz

NFC: nxp-nci: Release firmware when switching to FW mode fails

2015-04-05T22:58:51Z

In that case, the firmware work will never be scheduled, will never complete and thus the firmware will never be released. Signed-off-by: Samuel Ortiz

NFC: nxp-nxi: Remove useless fw pointer check

2015-04-05T22:51:17Z

It request_firmware returns 0, the request succeeded and the firmware pointer is valid. No need to check for it. Signed-off-by: Samuel Ortiz

nfc: st21nfca: Add additional comments about EVT_TRANSACTION

2015-04-05T22:21:10Z

Add comments about HCI EVT_TRANSACTION in order to make the code understandable by other readers. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz

nfc: st21nfcb: Add additional comments about EVT_TRANSACTION

2015-04-05T22:19:22Z

Add comments about HCI EVT_TRANSACTION in order to make the code understandable by other readers. Reported-by: Dan Carpenter Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz