diff options
| author |   Mark Brown <broonie@kernel.org> | 2022-07-11 15:51:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-07-11 15:51:01 +0100 |
| commit | 39c5c44fc451c083908e77c3b2762fae2bf8acca (patch) | |
| tree | 6e3c05c56e48fa9d29ad1f89614e9f0ef48459d4 /sound/soc/intel/boards | |
| parent | ASoC: fsl_utils: Drop usage of __clk_get_name() (diff) | |
| parent | ASoC: rockchip: i2s: Fix NULL pointer dereference when pinctrl is not found (diff) | |
| download | linux-dev-39c5c44fc451c083908e77c3b2762fae2bf8acca.tar.xz linux-dev-39c5c44fc451c083908e77c3b2762fae2bf8acca.zip | |
ASoC: Merge up fixes
Needed for the Rockchip driver.
Diffstat (limited to 'sound/soc/intel/boards')
| -rw-r--r-- | sound/soc/intel/boards/sof_rt5682.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index a24fb71d5ff3..1384716c6360 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -69,11 +69,10 @@ static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN | static int is_legacy_cpu; -static struct snd_soc_jack sof_hdmi[3]; - struct sof_hdmi_pcm { struct list_head head; struct snd_soc_dai *codec_dai; + struct snd_soc_jack hdmi_jack; int device; }; @@ -447,7 +446,6 @@ static int sof_card_late_probe(struct snd_soc_card *card) char jack_name[NAME_SIZE]; struct sof_hdmi_pcm *pcm; int err; - int i = 0; /* HDMI is not supported by SOF on Baytrail/CherryTrail */ if (is_legacy_cpu || !ctx->idisp_codec) @@ -468,17 +466,15 @@ static int sof_card_late_probe(struct snd_soc_card *card) snprintf(jack_name, sizeof(jack_name), "HDMI/DP, pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, - SND_JACK_AVOUT, &sof_hdmi[i]); + SND_JACK_AVOUT, &pcm->hdmi_jack); if (err) return err; err = hdac_hdmi_jack_init(pcm->codec_dai, pcm->device, - &sof_hdmi[i]); + &pcm->hdmi_jack); if (err < 0) return err; - - i++; } if (sof_rt5682_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT) { |