diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-12 09:01:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-12 09:01:18 -0700 |
| commit | 7702f47623e6c029b4ce59ce0ad39b869d5cc933 (patch) | |
| tree | ae6a9ea2cc9445f43a9e05a35c717fe69134b274 /include | |
| parent | 467251c69b1b39df78638d0d0cc60cf4d1d639a8 (diff) | |
| parent | 99fee508245825765ff60155fed43f970ff83a8f (diff) | |
| download | linux-7702f47623e6c029b4ce59ce0ad39b869d5cc933.tar.gz | |
Merge tag 'sound-4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "It's been a busy week for defending the attacks from fuzzer people. This contains various USB-audio driver fixes and sequencer core fixes spotted by syzkaller and other fuzzer, as well as one quirk for a Plantronics USB audio device" * tag 'sound-4.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: caiaq: Fix stray URB at probe error path ALSA: seq: Fix use-after-free at creating a port ALSA: usb-audio: Kill stray URB at exiting ALSA: line6: Fix leftover URB at error-path during probe ALSA: line6: Fix NULL dereference at podhd_disconnect() ALSA: line6: Fix missing initialization before error path ALSA: seq: Fix copy_from_user() call inside lock ALSA: usb-audio: Add sample rate quirk for Plantronics P610
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/seq_virmidi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/seq_virmidi.h b/include/sound/seq_virmidi.h index a03acd0d398a..695257ae64ac 100644 --- a/include/sound/seq_virmidi.h +++ b/include/sound/seq_virmidi.h @@ -60,6 +60,7 @@ struct snd_virmidi_dev { int port; /* created/attached port */ unsigned int flags; /* SNDRV_VIRMIDI_* */ rwlock_t filelist_lock; + struct rw_semaphore filelist_sem; struct list_head filelist; }; |