diff options
| author | Mark Brown <broonie@kernel.org> | 2022-04-05 12:29:12 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-05 12:29:12 +0300 |
| commit | 9a2c98418930c60e25b89a140c8b42a8cd6d84a6 (patch) | |
| tree | bac0f7d760c299545b4abfb07e64f202fab6c73a /sound/soc/codecs/rt5682s.c | |
| parent | 66e384d86ff533b3352a1f897c6bc7bf7f1adafe (diff) | |
| parent | 0b3d5d2e358ca6772fc3662fca27acb12a682fbf (diff) | |
| download | linux-9a2c98418930c60e25b89a140c8b42a8cd6d84a6.tar.xz | |
ASoC: Pull in fixes
cs35l41 is getting some active work and conflicts, plus some of the
fixes are needed for my testing.
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/rt5682s.c')
| -rw-r--r-- | sound/soc/codecs/rt5682s.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c index 7e4ac6560dee..cb20dc8cd0c7 100644 --- a/sound/soc/codecs/rt5682s.c +++ b/sound/soc/codecs/rt5682s.c @@ -2687,14 +2687,11 @@ static int rt5682s_bclk_set_rate(struct clk_hw *hw, unsigned long rate, for_each_component_dais(component, dai) if (dai->id == RT5682S_AIF1) - break; - if (!dai) { - dev_err(component->dev, "dai %d not found in component\n", - RT5682S_AIF1); - return -ENODEV; - } + return rt5682s_set_bclk1_ratio(dai, factor); - return rt5682s_set_bclk1_ratio(dai, factor); + dev_err(component->dev, "dai %d not found in component\n", + RT5682S_AIF1); + return -ENODEV; } static const struct clk_ops rt5682s_dai_clk_ops[RT5682S_DAI_NUM_CLKS] = { |