projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.30' into for-2.6.31
[linux-2.6-block.git]
/
sound
/
oss
/
au1550_ac97.c
diff --git
a/sound/oss/au1550_ac97.c
b/sound/oss/au1550_ac97.c
index 81e1f443d0948b223cdfdaf4d58aeb68452e59fa..4191acccbcdb93fab12373847688b91103d52c65 100644
(file)
--- a/
sound/oss/au1550_ac97.c
+++ b/
sound/oss/au1550_ac97.c
@@
-1627,7
+1627,9
@@
au1550_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
sizeof(abinfo)) ? -EFAULT : 0;
case SNDCTL_DSP_NONBLOCK:
sizeof(abinfo)) ? -EFAULT : 0;
case SNDCTL_DSP_NONBLOCK:
+ spin_lock(&file->f_lock);
file->f_flags |= O_NONBLOCK;
file->f_flags |= O_NONBLOCK;
+ spin_unlock(&file->f_lock);
return 0;
case SNDCTL_DSP_GETODELAY:
return 0;
case SNDCTL_DSP_GETODELAY: