diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-07-02 10:35:36 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-07-02 10:35:36 -0400 |
| commit | a5d573c7cae2add6b39dfdbdbcc2a6d26e5daf5d (patch) | |
| tree | 7a5609257e4f93104fc786abf5d4f1c02080d839 /sound/soc/qcom/lpass-cpu.c | |
| parent | c7395ea35c9252962899b2f7914456549d11bd96 (diff) | |
| parent | 65859eca4dff1af0db5e36d1cfbac15b834c6a65 (diff) | |
| download | linux-rt-a5d573c7cae2add6b39dfdbdbcc2a6d26e5daf5d.tar.gz | |
Merge tag 'v5.10.42' into v5.10-rt
This is the 5.10.42 stable release
Conflicts:
include/net/sch_generic.h
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'sound/soc/qcom/lpass-cpu.c')
| -rw-r--r-- | sound/soc/qcom/lpass-cpu.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 4fb2ec7c8867..7a30a12519a7 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -839,18 +839,8 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) if (dai_id == LPASS_DP_RX) continue; - drvdata->mi2s_osr_clk[dai_id] = devm_clk_get(dev, + drvdata->mi2s_osr_clk[dai_id] = devm_clk_get_optional(dev, variant->dai_osr_clk_names[i]); - if (IS_ERR(drvdata->mi2s_osr_clk[dai_id])) { - dev_warn(dev, - "%s() error getting optional %s: %ld\n", - __func__, - variant->dai_osr_clk_names[i], - PTR_ERR(drvdata->mi2s_osr_clk[dai_id])); - - drvdata->mi2s_osr_clk[dai_id] = NULL; - } - drvdata->mi2s_bit_clk[dai_id] = devm_clk_get(dev, variant->dai_bit_clk_names[i]); if (IS_ERR(drvdata->mi2s_bit_clk[dai_id])) { |