diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-30 10:53:17 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-30 10:53:17 +0300 |
| commit | b84a9523bab4a2483d7b7566b81a7859c2fd9a78 (patch) | |
| tree | 10cdebd482fc53568e9f025e3f1e665451fb3cb1 /sound/soc/codecs/rt5616.c | |
| parent | 2a28e4d28ca1dcaf5073351517e9b22400994289 (diff) | |
| parent | 1b4861e32e461b6fae14dc49ed0f1c7f20af5146 (diff) | |
| download | linux-b84a9523bab4a2483d7b7566b81a7859c2fd9a78.tar.xz | |
Merge v6.9.3
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/codecs/rt5616.c')
| -rw-r--r-- | sound/soc/codecs/rt5616.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/codecs/rt5616.c b/sound/soc/codecs/rt5616.c index c13108b51eaf..e7aa60e73961 100644 --- a/sound/soc/codecs/rt5616.c +++ b/sound/soc/codecs/rt5616.c @@ -1174,9 +1174,6 @@ static int rt5616_set_bias_level(struct snd_soc_component *component, * away from ON. Disable the clock in that case, otherwise * enable it. */ - if (IS_ERR(rt5616->mclk)) - break; - if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_ON) { clk_disable_unprepare(rt5616->mclk); } else { @@ -1225,9 +1222,9 @@ static int rt5616_probe(struct snd_soc_component *component) struct rt5616_priv *rt5616 = snd_soc_component_get_drvdata(component); /* Check if MCLK provided */ - rt5616->mclk = devm_clk_get(component->dev, "mclk"); - if (PTR_ERR(rt5616->mclk) == -EPROBE_DEFER) - return -EPROBE_DEFER; + rt5616->mclk = devm_clk_get_optional(component->dev, "mclk"); + if (IS_ERR(rt5616->mclk)) + return PTR_ERR(rt5616->mclk); rt5616->component = component; |