summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-01-21 14:27:14 +0100
committerTakashi Iwai <tiwai@suse.de>2010-01-21 14:27:14 +0100
commit8b296c8f9f660b70e958e6e6b9b4293e6ae854f2 (patch)
tree44835f43c998fded6cf13c624032e788611369f9 /include/sound
parent88501ce18eaaf1273e024d26926134972f4644ea (diff)
parentc91a988dc6551c66418690e36b2a23cdb0255da8 (diff)
downloadop-kernel-dev-8b296c8f9f660b70e958e6e6b9b4293e6ae854f2.zip
op-kernel-dev-8b296c8f9f660b70e958e6e6b9b4293e6ae854f2.tar.gz
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/pcm.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 1d4ca2a..768e309 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -311,8 +311,9 @@ struct snd_pcm_runtime {
struct snd_pcm_mmap_control *control;
/* -- locking / scheduling -- */
- unsigned int nowake: 1; /* no wakeup (data-copy in progress) */
- wait_queue_head_t sleep;
+ unsigned int twake: 1; /* do transfer (!poll) wakeup */
+ wait_queue_head_t sleep; /* poll sleep */
+ wait_queue_head_t tsleep; /* transfer sleep */
struct fasync_struct *fasync;
/* -- private section -- */
OpenPOWER on IntegriCloud