diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-01-08 10:17:18 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-01-08 10:17:37 +0300 |
| commit | 821e2ac632ff77bf7abaf2dfad7214fe8563edf1 (patch) | |
| tree | 6d09654aed8ccd7f45f307191d350a0d7c236255 /sound/soc/codecs/hda.c | |
| parent | b6ce6e6c79e4ec650887f1fe391a70e54972001a (diff) | |
| parent | f90dffdce70ff724f9ee8b0bcc711e86e6663896 (diff) | |
| download | linux-821e2ac632ff77bf7abaf2dfad7214fe8563edf1.tar.xz | |
Merge branch 'for-next' into for-linus
Prepare for 6.8 merge.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/codecs/hda.c')
| -rw-r--r-- | sound/soc/codecs/hda.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c index d57b043d6bfe..d2117e36ddd1 100644 --- a/sound/soc/codecs/hda.c +++ b/sound/soc/codecs/hda.c @@ -52,6 +52,7 @@ static int hda_codec_create_dais(struct hda_codec *codec, int pcm_count, stream->channels_max = pcm->stream[dir].channels_max; stream->rates = pcm->stream[dir].rates; stream->formats = pcm->stream[dir].formats; + stream->subformats = pcm->stream[dir].subformats; stream->sig_bits = pcm->stream[dir].maxbps; capture_dais: @@ -71,6 +72,7 @@ capture_dais: stream->channels_max = pcm->stream[dir].channels_max; stream->rates = pcm->stream[dir].rates; stream->formats = pcm->stream[dir].formats; + stream->subformats = pcm->stream[dir].subformats; stream->sig_bits = pcm->stream[dir].maxbps; } |