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/au1550_ac97.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/au1550_ac97.c')
| -rw-r--r-- | sound/oss/au1550_ac97.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index 81e1f443d094..4191acccbcdb 100644 --- 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, | |||
| 1627 | sizeof(abinfo)) ? -EFAULT : 0; | 1627 | sizeof(abinfo)) ? -EFAULT : 0; |
| 1628 | 1628 | ||
| 1629 | case SNDCTL_DSP_NONBLOCK: | 1629 | case SNDCTL_DSP_NONBLOCK: |
| 1630 | spin_lock(&file->f_lock); | ||
| 1630 | file->f_flags |= O_NONBLOCK; | 1631 | file->f_flags |= O_NONBLOCK; |
| 1632 | spin_unlock(&file->f_lock); | ||
| 1631 | return 0; | 1633 | return 0; |
| 1632 | 1634 | ||
| 1633 | case SNDCTL_DSP_GETODELAY: | 1635 | case SNDCTL_DSP_GETODELAY: |