diff options
| author |   Alexander Sverdlin <alexander.sverdlin@nokia.com> | 2015-06-12 14:40:37 +0200 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2015-06-17 14:35:37 +0200 |
| commit | e766f338a74200b8104b1165776b19f56e252834 (patch) | |
| tree | 8cd498c1478128f9d322ecd42ee2d66174732c3f /drivers/i2c | |
| parent | i2c: use parent adapter quirks in mux (diff) | |
| download | linux-dev-e766f338a74200b8104b1165776b19f56e252834.tar.xz linux-dev-e766f338a74200b8104b1165776b19f56e252834.zip | |
i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer()
Newly introduced quirks infrastructure doesn't work for the devices behind
MUXes because MUX's master_xfer() calls parent's master_xfer() directly
without checking the quirks. Instead of duplicating check code in MUX just
call __i2c_transfer() instead. This has a side effect on tracing (messages
will appear on both MUX bus and parent bus), but maybe that's not bad at
the end.
Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Tested-by: Łukasz Gemborowski <lukasz.gemborowski@nokia.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
Fixes: b7f625840267b1 ("i2c: add quirk checks to core")
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index f190e75b9da8..2ba7c0fbc615 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -51,7 +51,7 @@ static int i2c_mux_master_xfer(struct i2c_adapter *adap, ret = priv->select(parent, priv->mux_priv, priv->chan_id); if (ret >= 0) - ret = parent->algo->master_xfer(parent, msgs, num); + ret = __i2c_transfer(parent, msgs, num); if (priv->deselect) priv->deselect(parent, priv->mux_priv, priv->chan_id); |