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

[ Upstream commit d4a41d10b2cb5890aeda6b2912973b2a754b05b1 ]

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: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c
index c5d2427a3db276064c9669722b2039e5ddf90e3f..2cf867b9796d8132db61996debd7f8af82b91f96 100644 (file)
--- a/drivers/nfc/st21nfcb/i2c.c
+++ b/drivers/nfc/st21nfcb/i2c.c
@@ -112,7 +112,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);
        }
@@ -151,7 +151,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);
        }