From: Christophe Ricard Date: Sat, 13 Sep 2014 08:28:51 +0000 (+0200) Subject: NFC: st21nfcb: remove error output X-Git-Tag: v3.18-rc1~10^2~75^2~80^2~2 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=bc6b8275924b8af3d10ac35df0579d94fa169680 NFC: st21nfcb: remove error output In case we are not able to read out the NDLC/NCI header, we do not consider this as an issue and we will give a later chance. The NDLC layer will handle errors thanks to its internal timers. Signed-off-by: Christophe Ricard Signed-off-by: Samuel Ortiz --- diff --git a/drivers/nfc/st21nfcb/i2c.c b/drivers/nfc/st21nfcb/i2c.c index 0b8f72176de0..c5d2427a3db2 100644 --- a/drivers/nfc/st21nfcb/i2c.c +++ b/drivers/nfc/st21nfcb/i2c.c @@ -156,10 +156,8 @@ static int st21nfcb_nci_i2c_read(struct st21nfcb_i2c_phy *phy, r = i2c_master_recv(client, buf, ST21NFCB_NCI_I2C_MIN_SIZE); } - if (r != ST21NFCB_NCI_I2C_MIN_SIZE) { - nfc_err(&client->dev, "cannot read ndlc & nci header\n"); + if (r != ST21NFCB_NCI_I2C_MIN_SIZE) return -EREMOTEIO; - } len = be16_to_cpu(*(__be16 *) (buf + 2)); if (len > ST21NFCB_NCI_I2C_MAX_SIZE) {