lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 320/434] ASoC: wm2200: add missed operations in remove and probe failure
    Date
    From: Chuhong Yuan <hslester96@gmail.com>

    [ Upstream commit 2dab09be49a1e7a4dd13cb47d3a1441a2ef33a87 ]

    This driver misses calls to pm_runtime_disable and regulator_bulk_disable
    in remove and a call to free_irq in probe failure.
    Add the calls to fix it.

    Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
    Link: https://lore.kernel.org/r/20191118073633.28237-1-hslester96@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/wm2200.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c
    index cf64e109c658..7b087d94141b 100644
    --- a/sound/soc/codecs/wm2200.c
    +++ b/sound/soc/codecs/wm2200.c
    @@ -2410,6 +2410,8 @@ static int wm2200_i2c_probe(struct i2c_client *i2c,

    err_pm_runtime:
    pm_runtime_disable(&i2c->dev);
    + if (i2c->irq)
    + free_irq(i2c->irq, wm2200);
    err_reset:
    if (wm2200->pdata.reset)
    gpio_set_value_cansleep(wm2200->pdata.reset, 0);
    @@ -2426,12 +2428,15 @@ static int wm2200_i2c_remove(struct i2c_client *i2c)
    {
    struct wm2200_priv *wm2200 = i2c_get_clientdata(i2c);

    + pm_runtime_disable(&i2c->dev);
    if (i2c->irq)
    free_irq(i2c->irq, wm2200);
    if (wm2200->pdata.reset)
    gpio_set_value_cansleep(wm2200->pdata.reset, 0);
    if (wm2200->pdata.ldo_ena)
    gpio_set_value_cansleep(wm2200->pdata.ldo_ena, 0);
    + regulator_bulk_disable(ARRAY_SIZE(wm2200->core_supplies),
    + wm2200->core_supplies);

    return 0;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 19:03    [W:3.410 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site