| From d1c4cb447a7efcb5608a33cdfed8ab4234378b0a Mon Sep 17 00:00:00 2001 |
| From: Chintan Patel <chintan.m.patel@intel.com> |
| Date: Mon, 18 Sep 2017 08:43:18 -0700 |
| Subject: ASoC: Intel: Skylake: Fix jack name format substitution |
| |
| From: Chintan Patel <chintan.m.patel@intel.com> |
| |
| commit d1c4cb447a7efcb5608a33cdfed8ab4234378b0a upstream. |
| |
| Jack name is not getting formatted correctly hence resulting |
| in invalid name for HDMI/DP input devices. |
| |
| This was recently exposed due changes brought by MST: |
| commit 3a13347f05fd ("ASoC: Intel: kbl: Add jack port initialize |
| in kbl machine drivers") |
| |
| Signed-off-by: Chintan Patel <chintan.m.patel@intel.com> |
| Acked-By: Vinod Koul <vinod.koul@intel.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Cc: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c |
| +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c |
| @@ -604,6 +604,8 @@ static int kabylake_card_late_probe(stru |
| |
| list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { |
| codec = pcm->codec_dai->codec; |
| + 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, &ctx->kabylake_hdmi[i], |
| NULL, 0); |
