Skip to content

Commit

Permalink
i2c-algo-pca: Return standard fault codes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Oct 30, 2011
1 parent abc01b2 commit 4403988
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/i2c/algos/i2c-algo-pca.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
} else {
dev_dbg(&i2c_adap->dev, "bus is not idle. status is "
"%#04x\n", state);
return -EAGAIN;
return -EBUSY;
}
}

Expand Down Expand Up @@ -224,7 +224,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
}

curmsg = 0;
ret = -EREMOTEIO;
ret = -EIO;
while (curmsg < num) {
state = pca_status(adap);

Expand Down Expand Up @@ -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 */
DEB2("NOT ACK received after SLA+W\n");
pca_stop(adap);
ret = -ENXIO;
goto out;

case 0x40: /* SLA+R has been transmitted; ACK has been received */
Expand All @@ -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 */
DEB2("NOT ACK received after SLA+R\n");
pca_stop(adap);
ret = -ENXIO;
goto out;

case 0x30: /* Data byte in I2CDAT has been transmitted; NOT ACK has been received */
Expand Down

0 comments on commit 4403988

Please sign in to comment.