projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge existing fixes from asoc/for-6.1 into new branch
[platform/kernel/linux-rpi.git]
/
sound
/
soc
/
codecs
/
mt6660.c
diff --git
a/sound/soc/codecs/mt6660.c
b/sound/soc/codecs/mt6660.c
index
554c33e
..
cc2df5f
100644
(file)
--- a/
sound/soc/codecs/mt6660.c
+++ b/
sound/soc/codecs/mt6660.c
@@
-503,14
+503,14
@@
static int mt6660_i2c_probe(struct i2c_client *client)
dev_err(chip->dev, "read chip revision fail\n");
goto probe_fail;
}
dev_err(chip->dev, "read chip revision fail\n");
goto probe_fail;
}
+ pm_runtime_set_active(chip->dev);
+ pm_runtime_enable(chip->dev);
ret = devm_snd_soc_register_component(chip->dev,
&mt6660_component_driver,
&mt6660_codec_dai, 1);
ret = devm_snd_soc_register_component(chip->dev,
&mt6660_component_driver,
&mt6660_codec_dai, 1);
- if (!ret) {
- pm_runtime_set_active(chip->dev);
- pm_runtime_enable(chip->dev);
- }
+ if (ret)
+ pm_runtime_disable(chip->dev);
return ret;
return ret;