lkml.org 
[lkml]   [2015]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 128/251] i2c: mux: Use __i2c_transfer() instead of calling parent's master_xfer()
    Date
    3.19.8-ckt4 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexander Sverdlin <alexander.sverdlin@nokia.com>

    commit e766f338a74200b8104b1165776b19f56e252834 upstream.

    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>
    Fixes: b7f625840267b1 ("i2c: add quirk checks to core")
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/i2c/i2c-mux.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    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);

    --
    1.9.1


    \
     
     \ /
      Last update: 2015-07-16 04:21    [W:4.061 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site