diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-10-14 15:54:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-10-14 15:54:30 +0200 |
| commit | 6f00d1651b32f7f2951d9f299eb79b03c10186e3 (patch) | |
| tree | 0cdab37749571b878d832d897d11402889516b89 /include/sound | |
| parent | 53451b6da8271905941eb1eb369db152c4bd92f2 (diff) | |
| parent | aef454b40288158b850aab13e3d2a8c406779401 (diff) | |
Merge branch 'for-linus' into for-next
A back-merge of 5.15 branch into 5.16-devel branch for further
development of USB and ALSA core stuff that depends on 5.15 fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hda_codec.h | 1 | ||||
| -rw-r--r-- | include/sound/rawmidi.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index 01570dbda503..0e45963bb767 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -224,6 +224,7 @@ struct hda_codec { #endif /* misc flags */ + unsigned int configured:1; /* codec was configured */ unsigned int in_freeing:1; /* being released */ unsigned int registered:1; /* codec was registered */ unsigned int display_power_control:1; /* needs display power */ diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h index 989e1517332d..7a08ed2acd60 100644 --- a/include/sound/rawmidi.h +++ b/include/sound/rawmidi.h @@ -98,6 +98,7 @@ struct snd_rawmidi_file { struct snd_rawmidi *rmidi; struct snd_rawmidi_substream *input; struct snd_rawmidi_substream *output; + unsigned int user_pversion; /* supported protocol version */ }; struct snd_rawmidi_str { |