diff options
author | Mark Brown <broonie@kernel.org> | 2019-02-06 17:31:39 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-02-06 17:31:39 +0000 |
commit | e29fe437ea5d926ea23d806b2468bf60ee8dc08a (patch) | |
tree | 958f74204fc7b15fb7a572c356bc15ac7384be01 /sound/soc/codecs | |
parent | ASoC: ssm2602: switch to SPDX identifier (diff) | |
parent | ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables (diff) | |
download | linux-dev-e29fe437ea5d926ea23d806b2468bf60ee8dc08a.tar.xz linux-dev-e29fe437ea5d926ea23d806b2468bf60ee8dc08a.zip |
Merge branch 'asoc-5.0' into asoc-5.1 for dapm table
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/hdmi-codec.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/rt5682.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index d00734d31e04..e5b6769b9797 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -795,6 +795,8 @@ static int hdmi_codec_probe(struct platform_device *pdev) if (hcd->spdif) hcp->daidrv[i] = hdmi_spdif_dai; + dev_set_drvdata(dev, hcp); + ret = devm_snd_soc_register_component(dev, &hdmi_driver, hcp->daidrv, dai_count); if (ret) { @@ -802,8 +804,6 @@ static int hdmi_codec_probe(struct platform_device *pdev) __func__, ret); return ret; } - - dev_set_drvdata(dev, hcp); return 0; } diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index bd45d0343913..9d5acd2d04ab 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -1784,7 +1784,9 @@ static const struct snd_soc_dapm_route rt5682_dapm_routes[] = { {"ADC Stereo1 Filter", NULL, "ADC STO1 ASRC", is_using_asrc}, {"DAC Stereo1 Filter", NULL, "DAC STO1 ASRC", is_using_asrc}, {"ADC STO1 ASRC", NULL, "AD ASRC"}, + {"ADC STO1 ASRC", NULL, "DA ASRC"}, {"ADC STO1 ASRC", NULL, "CLKDET"}, + {"DAC STO1 ASRC", NULL, "AD ASRC"}, {"DAC STO1 ASRC", NULL, "DA ASRC"}, {"DAC STO1 ASRC", NULL, "CLKDET"}, |