diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/oss/audio.c | |
parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
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: |