diff options
| author | Chuhong Yuan <hslester96@gmail.com> | 2019-11-18 15:37:07 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-31 16:36:07 +0100 |
| commit | 41749c6ff3dd82f20b665881254a4c10d0f93636 (patch) | |
| tree | b898b6cd5a6215425ecadbd4a01aad9a2958f258 /sound/soc | |
| parent | c6b41a403bd1072099ff50087b4b28b4bf26b7f2 (diff) | |
| download | linux-stable-41749c6ff3dd82f20b665881254a4c10d0f93636.tar.gz linux-stable-41749c6ff3dd82f20b665881254a4c10d0f93636.tar.bz2 linux-stable-41749c6ff3dd82f20b665881254a4c10d0f93636.zip | |
ASoC: wm5100: add missed pm_runtime_disable
[ 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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm5100.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c index ba89d9d711f7..b793701aafcd 100644 --- a/sound/soc/codecs/wm5100.c +++ b/sound/soc/codecs/wm5100.c @@ -2620,6 +2620,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); @@ -2643,6 +2644,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); |