OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2dab09b
)
ASoC: wm5100: add missed pm_runtime_disable
author
Chuhong Yuan
<hslester96@gmail.com>
Mon, 18 Nov 2019 07:37:07 +0000
(15:37 +0800)
committer
Mark Brown
<broonie@kernel.org>
Mon, 18 Nov 2019 13:02:37 +0000
(13:02 +0000)
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>
sound/soc/codecs/wm5100.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm5100.c
b/sound/soc/codecs/wm5100.c
index
4af0e51
..
91cc63c
100644
(file)
--- 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);