evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "NFC: Disable i2c write failure log"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-21 13:29:03 -07:00 • committed by Gerrit - the friendly Code Review server
commit 09ddd6a693
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/nfc/nq-nci.c
View file

@ -267,7 +267,7 @@ static ssize_t nfc_write(struct file *filp, const char __user *buf,
ret = i2c_master_send(nqx_dev->client, tmp, count); ret = i2c_master_send(nqx_dev->client, tmp, count);
if (ret != count) { if (ret != count) {
dev_err(&nqx_dev->client->dev, dev_dbg(&nqx_dev->client->dev,
"%s: failed to write %d\n", __func__, ret); "%s: failed to write %d\n", __func__, ret);
ret = -EIO; ret = -EIO;
goto out_free; goto out_free;
@ -304,7 +304,7 @@ static int nqx_standby_write(struct nqx_dev *nqx_dev,
for (retry_cnt = 1; retry_cnt <= MAX_RETRY_COUNT; retry_cnt++) { for (retry_cnt = 1; retry_cnt <= MAX_RETRY_COUNT; retry_cnt++) {
ret = i2c_master_send(nqx_dev->client, buf, len); ret = i2c_master_send(nqx_dev->client, buf, len);
if (ret < 0) { if (ret < 0) {
dev_err(&nqx_dev->client->dev, dev_dbg(&nqx_dev->client->dev,
"%s: write failed, Maybe in Standby Mode - Retry(%d)\n", "%s: write failed, Maybe in Standby Mode - Retry(%d)\n",
__func__, retry_cnt); __func__, retry_cnt);
usleep_range(1000, 1100); usleep_range(1000, 1100);