diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2023-11-01 02:07:35 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2023-11-01 02:07:35 +0300 |
| commit | 20cd569d7ee8fce24e8753f0f43af6c420557b1f (patch) | |
| tree | f559cfda594846795aa51c99d96f92d8c912851a /sound/soc/codecs/hdmi-codec.c | |
| parent | 62cc9c3cb3ec1bf31cc116146185ed97b450836a (diff) | |
| parent | eeebfe6259ba2d5b0980eb7b0df384eb77e9e4f5 (diff) | |
| download | linux-20cd569d7ee8fce24e8753f0f43af6c420557b1f.tar.xz | |
Merge branch 'for-6.7/config_pm' into for-linus
- #ifdef CONFIG_PM removal from HID code (Thomas Weißschuh)
Diffstat (limited to 'sound/soc/codecs/hdmi-codec.c')
| -rw-r--r-- | sound/soc/codecs/hdmi-codec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index 13689e718d36..09eef6042aad 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -531,7 +531,10 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, hp->sample_rate = sample_rate; hp->channels = channels; - hcp->chmap_idx = idx; + if (pcm_audio) + hcp->chmap_idx = ca_id; + else + hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; return 0; } |