diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-12-18 22:05:39 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-12-18 22:07:43 +0300 |
| commit | a032ff0e8065668e672eb2e223e265b7808f35a3 (patch) | |
| tree | 90c43579c425f8789fc9cec99c8ea39ba6c26874 /include/sound | |
| parent | df4654bd6e42125d9b85ce3a26eaca2935290b98 (diff) | |
| parent | 92adc96f8eecd9522a907c197cc3d62e405539fe (diff) | |
| download | linux-a032ff0e8065668e672eb2e223e265b7808f35a3.tar.xz | |
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 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index c28a1ed5e8df..262896799826 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1150,6 +1150,7 @@ struct snd_soc_pcm_runtime { unsigned int num_codecs; struct delayed_work delayed_work; + void (*close_delayed_work_func)(struct snd_soc_pcm_runtime *rtd); #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dpcm_root; #endif |