diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:14:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 16:14:02 -0700 |
| commit | 8e9d2089723d08d51e66c5eea49253d76e27941e (patch) | |
| tree | cf15609d5eeb0c1f3a39231d8ce793d3c8ad0ed0 /sound/core/oss | |
| parent | ba1eb95cf3cc666769afe42eaa15a3a34ae82f94 (diff) | |
| parent | 60aa49243d09afc873f082567d2e3c16634ced84 (diff) | |
| download | linux-8e9d2089723d08d51e66c5eea49253d76e27941e.tar.bz2 | |
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* 'bkl-removal' of git://git.lwn.net/linux-2.6:
Rationalize fasync return values
Move FASYNC bit handling to f_op->fasync()
Use f_lock to protect f_flags
Rename struct file->f_ep_lock
Diffstat (limited to 'sound/core/oss')
| -rw-r--r-- | sound/core/oss/pcm_oss.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 2864cefb773c..dda000b9684c 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -1903,7 +1903,9 @@ static int snd_pcm_oss_set_fragment(struct snd_pcm_oss_file *pcm_oss_file, unsig static int snd_pcm_oss_nonblock(struct file * file) { + spin_lock(&file->f_lock); file->f_flags |= O_NONBLOCK; + spin_unlock(&file->f_lock); return 0; } |