shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-24 19:40:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls to device 0"

Browse Source 
This reverts commit 558386e40e.
This commit is contained in:
Mauro (mdrjr) Ribeiro
2023-10-02 16:11:38 -03:00
parent 2747f8b4f1
commit bb3d21acb6
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/core/pcm_lib.c
View File

@@ -2516,10 +2516,7 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,
knew.name = "Playback Channel Map";
else
knew.name = "Capture Channel Map";
if (pcm->internal && pcm->device)
dev_info(pcm->card->dev, "workaround active: internal PCM chmap controls mapped to device 0\n");
else
knew.device = pcm->device;
knew.device = pcm->device;
knew.count = pcm->streams[stream].substream_count;
knew.private_value = private_value;
info->kctl = snd_ctl_new1(&knew, info);

3
sound/soc/codecs/hdmi-codec.c
View File

@@ -793,8 +793,7 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd,
if (!kctl)
return -ENOMEM;
if (!rtd->pcm->internal)
kctl->id.device = rtd->pcm->device;
kctl->id.device = rtd->pcm->device;
ret = snd_ctl_add(rtd->card->snd_card, kctl);
if (ret < 0)
return ret;