i2c: mux: pca954x: Use __i2c_transfer because of quirks

pca9541 and pca954x are calling master_xfer() of the parent adapter directly
thus bypassing the quirks checks of the adapter. Use __i2c_transfer() instead.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Tested-by: Łukasz Gemborowski <lukasz.gemborowski@nokia.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
Fixes: b7f625840267b1 ("i2c: add quirk checks to core")

diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c
index cb772775da431e78ba5ecf1a3da9c45fba135a03..0c8d4d2cbdaf42a5844a19b13acfd652a3b2f3a9 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-pca9541.c
+++ b/drivers/i2c/muxes/i2c-mux-pca9541.c
@@ -104,7 +104,7 @@ static int pca9541_reg_write(struct i2c_client *client, u8 command, u8 val)
                buf[0] = command;
                buf[1] = val;
                msg.buf = buf;
-               ret = adap->algo->master_xfer(adap, &msg, 1);
+               ret = __i2c_transfer(adap, &msg, 1);
        } else {
                union i2c_smbus_data data;
 
@@ -144,7 +144,7 @@ static int pca9541_reg_read(struct i2c_client *client, u8 command)
                                .buf = &val
                        }
                };
-               ret = adap->algo->master_xfer(adap, msg, 2);
+               ret = __i2c_transfer(adap, msg, 2);
                if (ret == 2)
                        ret = val;
                else if (ret >= 0)

diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index bea0d2de29938404cb96b69bb684c47d0a43bf7e..ea4aa9dfcea9674f412cdfae21d8735f2885d650 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -134,7 +134,7 @@ static int pca954x_reg_write(struct i2c_adapter *adap,
                msg.len = 1;
                buf[0] = val;
                msg.buf = buf;
-               ret = adap->algo->master_xfer(adap, &msg, 1);
+               ret = __i2c_transfer(adap, &msg, 1);
        } else {
                union i2c_smbus_data data;
                ret = adap->algo->smbus_xfer(adap, client->addr,