Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e9466cc authored by Christophe Ricard's avatar Christophe Ricard Committed by Samuel Ortiz
Browse files

NFC: st21nfca: Improved start of frame detection 



A start of frame is 7E 00 not only 7E. Make sure the first read sequence is
starting with 7E 00.
For example: 7E FF FF FF FF is as a correct crc but it is a bad frame.

Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent cf577344

drivers/nfc/st21nfca/i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -397,12 +397,11 @@ static int st21nfca_hci_i2c_read(struct st21nfca_i2c_phy *phy, 
		 * The first read sequence does not start with SOF.

		 * Data is corrupeted so we drop it.

		 */

		if (!phy->current_read_len && buf[0] != ST21NFCA_SOF_EOF) {

		if (!phy->current_read_len && !IS_START_OF_FRAME(buf)) {

			skb_trim(skb, 0);

			phy->current_read_len = 0;

			return -EIO;

		} else if (phy->current_read_len &&

			IS_START_OF_FRAME(buf)) {

		} else if (phy->current_read_len && IS_START_OF_FRAME(buf)) {

			/*

			 * Previous frame transmission was interrupted and

			 * the frame got repeated.