diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-12-18 20:05:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-12-18 20:07:43 +0100 |
| commit | a032ff0e8065668e672eb2e223e265b7808f35a3 (patch) | |
| tree | 90c43579c425f8789fc9cec99c8ea39ba6c26874 /sound/usb/card.h | |
| parent | df4654bd6e42125d9b85ce3a26eaca2935290b98 (diff) | |
| parent | 92adc96f8eecd9522a907c197cc3d62e405539fe (diff) | |
| download | blackbird-op-linux-a032ff0e8065668e672eb2e223e265b7808f35a3.tar.gz blackbird-op-linux-a032ff0e8065668e672eb2e223e265b7808f35a3.zip | |
Merge branch 'for-linus' into for-next
Taking the 5.5 devel branch back into the main devel branch.
A USB-audio fix needs to be adjusted to adapt the changes that have
been formerly applied for stop_sync.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/card.h')
| -rw-r--r-- | sound/usb/card.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/card.h b/sound/usb/card.h index 2991b9986f66..395403a2d33f 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -145,6 +145,7 @@ struct snd_usb_substream { struct snd_usb_endpoint *sync_endpoint; unsigned long flags; bool need_setup_ep; /* (re)configure EP at prepare? */ + bool need_setup_fmt; /* (re)configure fmt after resume? */ unsigned int speed; /* USB_SPEED_XXX */ u64 formats; /* format bitmasks (all or'ed) */ |
