diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-21 08:27:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-21 08:27:14 -0500 |
| commit | 8b296c8f9f660b70e958e6e6b9b4293e6ae854f2 (patch) | |
| tree | 44835f43c998fded6cf13c624032e788611369f9 /include/sound | |
| parent | 88501ce18eaaf1273e024d26926134972f4644ea (diff) | |
| parent | c91a988dc6551c66418690e36b2a23cdb0255da8 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 1d4ca2aae50d..768e3098656c 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -311,8 +311,9 @@ struct snd_pcm_runtime { | |||
| 311 | struct snd_pcm_mmap_control *control; | 311 | struct snd_pcm_mmap_control *control; |
| 312 | 312 | ||
| 313 | /* -- locking / scheduling -- */ | 313 | /* -- locking / scheduling -- */ |
| 314 | unsigned int nowake: 1; /* no wakeup (data-copy in progress) */ | 314 | unsigned int twake: 1; /* do transfer (!poll) wakeup */ |
| 315 | wait_queue_head_t sleep; | 315 | wait_queue_head_t sleep; /* poll sleep */ |
| 316 | wait_queue_head_t tsleep; /* transfer sleep */ | ||
| 316 | struct fasync_struct *fasync; | 317 | struct fasync_struct *fasync; |
| 317 | 318 | ||
| 318 | /* -- private section -- */ | 319 | /* -- private section -- */ |