lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 144/210] mfd: lp8788: Fix an error handling path in lp8788_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit becfdcd75126b20b8ec10066c5e85b34f8994ad5 ]

    Should an error occurs in mfd_add_devices(), some resources need to be
    released, as already done in the .remove() function.

    Add an error handling path and a lp8788_irq_exit() call to undo a previous
    lp8788_irq_init().

    Fixes: eea6b7cc53aa ("mfd: Add lp8788 mfd driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Lee Jones <lee@kernel.org>
    Link: https://lore.kernel.org/r/18398722da9df9490722d853e4797350189ae79b.1659261275.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/lp8788.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/drivers/mfd/lp8788.c b/drivers/mfd/lp8788.c
    index acf616559512..e47150cdf747 100644
    --- a/drivers/mfd/lp8788.c
    +++ b/drivers/mfd/lp8788.c
    @@ -199,8 +199,16 @@ static int lp8788_probe(struct i2c_client *cl, const struct i2c_device_id *id)
    if (ret)
    return ret;

    - return mfd_add_devices(lp->dev, -1, lp8788_devs,
    - ARRAY_SIZE(lp8788_devs), NULL, 0, NULL);
    + ret = mfd_add_devices(lp->dev, -1, lp8788_devs,
    + ARRAY_SIZE(lp8788_devs), NULL, 0, NULL);
    + if (ret)
    + goto err_exit_irq;
    +
    + return 0;
    +
    +err_exit_irq:
    + lp8788_irq_exit(lp);
    + return ret;
    }

    static int lp8788_remove(struct i2c_client *cl)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 15:56    [W:5.265 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site