lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 304/350] ASoC: wm5100: add missed pm_runtime_disable
    Date
    From: Chuhong Yuan <hslester96@gmail.com>

    [ Upstream commit b1176bbb70866f24099cd2720283c7219fb4a81c ]

    The driver forgets to call pm_runtime_disable in remove and
    probe failure.
    Add the calls to fix it.

    Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
    Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
    Link: https://lore.kernel.org/r/20191118073707.28298-1-hslester96@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/wm5100.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
    index 4af0e519e6235..91cc63c5a51fa 100644
    --- a/sound/soc/codecs/wm5100.c
    +++ b/sound/soc/codecs/wm5100.c
    @@ -2617,6 +2617,7 @@ static int wm5100_i2c_probe(struct i2c_client *i2c,
    return ret;

    err_reset:
    + pm_runtime_disable(&i2c->dev);
    if (i2c->irq)
    free_irq(i2c->irq, wm5100);
    wm5100_free_gpio(i2c);
    @@ -2640,6 +2641,7 @@ static int wm5100_i2c_remove(struct i2c_client *i2c)
    {
    struct wm5100_priv *wm5100 = i2c_get_clientdata(i2c);

    + pm_runtime_disable(&i2c->dev);
    if (i2c->irq)
    free_irq(i2c->irq, wm5100);
    wm5100_free_gpio(i2c);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-12-10 22:17    [W:4.045 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site