This is a note to let you know that I've just added the patch titled nfc: st-nci: Fix non accurate comment for st_nci_i2c_read to the 4.2-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nfc-st-nci-fix-non-accurate-comment-for-st_nci_i2c_read.patch and it can be found in the queue-4.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From e7723b33077b04648213f043bc22654c54e375e4 Mon Sep 17 00:00:00 2001 From: Christophe Ricard <christophe.ricard@xxxxxxxxx> Date: Fri, 14 Aug 2015 22:33:32 +0200 Subject: nfc: st-nci: Fix non accurate comment for st_nci_i2c_read From: Christophe Ricard <christophe.ricard@xxxxxxxxx> commit e7723b33077b04648213f043bc22654c54e375e4 upstream. Due to a copy and paste error st_nci_i2c_read still contains st21nfca header comment. Signed-off-by: Christophe Ricard <christophe-h.ricard@xxxxxx> Signed-off-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/nfc/st-nci/i2c.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) --- a/drivers/nfc/st-nci/i2c.c +++ b/drivers/nfc/st-nci/i2c.c @@ -118,15 +118,10 @@ static int st_nci_i2c_write(void *phy_id /* * Reads an ndlc frame and returns it in a newly allocated sk_buff. * returns: - * frame size : if received frame is complete (find ST_NCI_SOF_EOF at - * end of read) - * -EAGAIN : if received frame is incomplete (not find ST_NCI_SOF_EOF - * at end of read) + * 0 : if received frame is complete * -EREMOTEIO : i2c read error (fatal) * -EBADMSG : frame was incorrect and discarded - * (value returned from st_nci_i2c_repack) - * -EIO : if no ST_NCI_SOF_EOF is found after reaching - * the read length end sequence + * -ENOMEM : cannot allocate skb, frame dropped */ static int st_nci_i2c_read(struct st_nci_i2c_phy *phy, struct sk_buff **skb) Patches currently in stable-queue which might be from christophe.ricard@xxxxxxxxx are queue-4.2/nfc-st-nci-fix-typo-when-changing-from-st21nfcb-to-st-nci.patch queue-4.2/nfc-st-nci-remove-duplicate-file-platform_data-st_nci.h.patch queue-4.2/nfc-st-nci-fix-non-accurate-comment-for-st_nci_i2c_read.patch queue-4.2/nfc-st-nci-free-data-with-irrelevant-ndlc-pcb_sync-value.patch queue-4.2/nfc-st-nci-fix-use-of-uninitialized-variables-in-error-path.patch queue-4.2/nfc-netlink-warning-fix.patch queue-4.2/nfc-st-nci-remove-data-from-ack_pending_q-when-receiving-a-sync_ack.patch queue-4.2/nfc-netlink-add-check-on-nfc_attr_vendor_data.patch queue-4.2/nfc-nci-hci-add-check-on-skb-nci_hci_send_cmd-parameter.patch queue-4.2/nfc-st21nfca-fix-use-of-uninitialized-variables-in-error-path.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html