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

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

NFC: st21nfcb: Retry i2c_master_send if it returns a negative value 



i2c_master_send may return many negative values different than
-EREMOTEIO.
In case an i2c transaction is NACK'ed, on raspberry pi B+
kernel 3.18, -EIO is generated instead.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 2ca21002

drivers/nfc/st21nfcb/i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int st21nfcb_nci_i2c_write(void *phy_id, struct sk_buff *skb) 
		return phy->ndlc->hard_fault;



	r = i2c_master_send(client, skb->data, skb->len);

	if (r == -EREMOTEIO) {  /* Retry, chip was in standby */

	if (r < 0) {  /* Retry, chip was in standby */

		usleep_range(1000, 4000);

		r = i2c_master_send(client, skb->data, skb->len);

	}
@@ -148,7 +148,7 @@ static int st21nfcb_nci_i2c_read(struct st21nfcb_i2c_phy *phy, 
	struct i2c_client *client = phy->i2c_dev;



	r = i2c_master_recv(client, buf, ST21NFCB_NCI_I2C_MIN_SIZE);

	if (r == -EREMOTEIO) {  /* Retry, chip was in standby */

	if (r < 0) {  /* Retry, chip was in standby */

		usleep_range(1000, 4000);

		r = i2c_master_recv(client, buf, ST21NFCB_NCI_I2C_MIN_SIZE);

	}