[PATCH 1/2] i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer()

[PATCH 1/2] i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer()

[Alexander Sverdlin]

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-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
Tested-by: Łukasz Gemborowski <lukasz.gemborowski-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
---
 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 06cc1ff..98dd5d4 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);

Re: [PATCH 1/2] i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer()

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 715 bytes --]

On Fri, Jun 12, 2015 at 02:40:37PM +0200, Alexander Sverdlin wrote:
> 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-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
> Tested-by: Łukasz Gemborowski <lukasz.gemborowski-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>

Applied to for-next with stable added, thanks!


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]