diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-02-05 12:33:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-02-05 12:33:45 +0100 |
| commit | 9db028827315550ea7e65898eebaf15d2456d830 (patch) | |
| tree | 4ba3067537cfd0d809fcac0396b2dab986c9930b /sound/soc/sof/intel/hda.c | |
| parent | c7e661a1c2ae98a4754db6a85fc686b4a89322ad (diff) | |
| parent | 42b716359beca10684195fd6e93a74ecd8ca8003 (diff) | |
Merge tag 'asoc-v5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.6
A collection of updates for bugs fixed since the initial pull
request, the most important one being the addition of COMMON_CLK
for wcd934x which is needed for MFD to be merged.
Diffstat (limited to 'sound/soc/sof/intel/hda.c')
| -rw-r--r-- | sound/soc/sof/intel/hda.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c index d08462f481de..65b86dd044f1 100644 --- a/sound/soc/sof/intel/hda.c +++ b/sound/soc/sof/intel/hda.c @@ -380,7 +380,8 @@ static int hda_init_caps(struct snd_sof_dev *sdev) /* create codec instances */ hda_codec_probe_bus(sdev, hda_codec_use_common_hdmi); - hda_codec_i915_put(sdev); + if (!HDA_IDISP_CODEC(bus->codec_mask)) + hda_codec_i915_display_power(sdev, false); /* * we are done probing so decrement link counts |