lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 096/606] i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit e9d1a0a41d4486955e96552293c1fcf1fce61602 ]

    A call to 'i2c_demux_deactivate_master()' is missing in the error handling
    path, as already done in the remove function.

    Fixes: 50a5ba876908 ("i2c: mux: demux-pinctrl: add driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c
    index 0e16490eb3a1..5365199a31f4 100644
    --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c
    +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c
    @@ -272,6 +272,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev)
    err_rollback_available:
    device_remove_file(&pdev->dev, &dev_attr_available_masters);
    err_rollback:
    + i2c_demux_deactivate_master(priv);
    for (j = 0; j < i; j++) {
    of_node_put(priv->chan[j].parent_np);
    of_changeset_destroy(&priv->chan[j].chgset);
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 01:18    [W:5.799 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site