Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-13 16:40:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i2c-algo-pca: Return standard fault codes

Browse Source 
Adjust i2c-algo-pca to return fault codes compliant with
Documentation/i2c/fault-codes, rather than the undocumented and
vague -EREMOTEIO.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Jean Delvare 2011-10-30 13:47:25 +01:00 committed by Jean Delvare
parent abc01b2718
commit 4403988afc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/i2c/algos/i2c-algo-pca.c
View File

@ -196,7 +196,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
} else { } else {
dev_dbg(&i2c_adap->dev, "bus is not idle. status is " dev_dbg(&i2c_adap->dev, "bus is not idle. status is "
"%#04x\n", state); "%#04x\n", state);
return -EAGAIN; return -EBUSY;
} }
} }
@ -224,7 +224,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
} }
curmsg = 0; curmsg = 0;
ret = -EREMOTEIO; ret = -EIO;
while (curmsg < num) { while (curmsg < num) {
state = pca_status(adap); state = pca_status(adap);
@ -259,6 +259,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
case 0x20: /* SLA+W has been transmitted; NOT ACK has been received */ case 0x20: /* SLA+W has been transmitted; NOT ACK has been received */
DEB2("NOT ACK received after SLA+W\n"); DEB2("NOT ACK received after SLA+W\n");
pca_stop(adap); pca_stop(adap);
ret = -ENXIO;
goto out; goto out;
case 0x40: /* SLA+R has been transmitted; ACK has been received */ case 0x40: /* SLA+R has been transmitted; ACK has been received */
@ -283,6 +284,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
case 0x48: /* SLA+R has been transmitted; NOT ACK has been received */ case 0x48: /* SLA+R has been transmitted; NOT ACK has been received */
DEB2("NOT ACK received after SLA+R\n"); DEB2("NOT ACK received after SLA+R\n");
pca_stop(adap); pca_stop(adap);
ret = -ENXIO;
goto out; goto out;
case 0x30: /* Data byte in I2CDAT has been transmitted; NOT ACK has been received */ case 0x30: /* Data byte in I2CDAT has been transmitted; NOT ACK has been received */