summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2014-09-13 10:28:51 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2014-09-24 02:02:24 +0200
commitbc6b8275924b8af3d10ac35df0579d94fa169680 (patch)
treeea497857c7622fffd78efeb537a88a0690ddc5f1 /drivers/nfc
parentNFC: st21nfcb: Add ISO15693 Reader/Writer support (diff)
downloadlinux-bc6b8275924b8af3d10ac35df0579d94fa169680.tar.xz
linux-bc6b8275924b8af3d10ac35df0579d94fa169680.zip
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 <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/st21nfcb/i2c.c4
1 files changed, 1 insertions, 3 deletions
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) {