diff options
author | Takashi Iwai <tiwai@suse.de> | 2020-05-28 10:08:46 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-05-28 10:08:50 +0200 |
commit | 6d2848402619f33895e419430ad43a223c4866fc (patch) | |
tree | a88115a04139f68e5240dfdf40e11c752a3e73a5 /include/sound | |
parent | e0b2db351bc708037571deb3fc82c7d9043b4ea8 (diff) | |
parent | 630e36126e420e1756378b3427b42711ce0b9ddd (diff) |
Merge branch 'for-linus' into for-next
Back-merge 5.7-devel branch for further development.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/rawmidi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h index a36b7227a15a..334842daa904 100644 --- a/include/sound/rawmidi.h +++ b/include/sound/rawmidi.h @@ -61,6 +61,7 @@ struct snd_rawmidi_runtime { size_t avail_min; /* min avail for wakeup */ size_t avail; /* max used buffer for wakeup */ size_t xruns; /* over/underruns counter */ + int buffer_ref; /* buffer reference count */ /* misc */ spinlock_t lock; wait_queue_head_t sleep; |