diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:14:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:14:02 -0400 |
| commit | 8e9d2089723d08d51e66c5eea49253d76e27941e (patch) | |
| tree | cf15609d5eeb0c1f3a39231d8ce793d3c8ad0ed0 /sound/oss/audio.c | |
| parent | ba1eb95cf3cc666769afe42eaa15a3a34ae82f94 (diff) | |
| parent | 60aa49243d09afc873f082567d2e3c16634ced84 (diff) | |
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/oss/audio.c')
| -rw-r--r-- | sound/oss/audio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/audio.c b/sound/oss/audio.c index 89bd27a5e865..b69c05b7ea7b 100644 --- a/sound/oss/audio.c +++ b/sound/oss/audio.c | |||
| @@ -433,7 +433,9 @@ int audio_ioctl(int dev, struct file *file, unsigned int cmd, void __user *arg) | |||
| 433 | return dma_ioctl(dev, cmd, arg); | 433 | return dma_ioctl(dev, cmd, arg); |
| 434 | 434 | ||
| 435 | case SNDCTL_DSP_NONBLOCK: | 435 | case SNDCTL_DSP_NONBLOCK: |
| 436 | spin_lock(&file->f_lock); | ||
| 436 | file->f_flags |= O_NONBLOCK; | 437 | file->f_flags |= O_NONBLOCK; |
| 438 | spin_unlock(&file->f_lock); | ||
| 437 | return 0; | 439 | return 0; |
| 438 | 440 | ||
| 439 | case SNDCTL_DSP_GETCAPS: | 441 | case SNDCTL_DSP_GETCAPS: |