i2c-algo-pca: Return standard fault codes

[karo-tx-linux.git] / drivers / i2c / algos / i2c-algo-pca.c

diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 4ca9cf9cde73db2ab35538bd0cdd058b0d8505ea..beb9ffe2564bc77ffb474ef1346a49c2600c89a5 100644 (file)
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -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;
                }
        }
 
@@ -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);
 
@@ -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 */
@@ -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 */