lkml.org 
[lkml]   [2016]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.7 065/143] i2c: mux: demux-pinctrl: properly roll back when adding adapter fails
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

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

    From: Wolfram Sang <wsa+renesas@sang-engineering.com>

    commit ce8cb803d8b90458495f23606c706f0c0c857cdc upstream.

    We also need to revert the dynamic OF change, so we get a consistent
    state again. Otherwise, we might have two devices enabled e.g. after
    pinctrl setup fails.

    Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
    +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
    @@ -68,7 +68,7 @@ static int i2c_demux_activate_master(str
    adap = of_find_i2c_adapter_by_node(priv->chan[new_chan].parent_np);
    if (!adap) {
    ret = -ENODEV;
    - goto err;
    + goto err_with_revert;
    }

    p = devm_pinctrl_get_select(adap->dev.parent, priv->bus_name);
    @@ -103,6 +103,8 @@ static int i2c_demux_activate_master(str

    err_with_put:
    i2c_put_adapter(adap);
    + err_with_revert:
    + of_changeset_revert(&priv->chan[new_chan].chgset);
    err:
    dev_err(priv->dev, "failed to setup demux-adapter %d (%d)\n", new_chan, ret);
    return ret;

    \
     
     \ /
      Last update: 2016-09-17 09:58    [W:4.161 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site