diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /sound/oss/vwsnd.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'sound/oss/vwsnd.c')
| -rw-r--r-- | sound/oss/vwsnd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 78b8acc7c3b9..187f72750e8f 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c | |||
| @@ -2673,7 +2673,9 @@ static int vwsnd_audio_do_ioctl(struct inode *inode, | |||
| 2673 | 2673 | ||
| 2674 | case SNDCTL_DSP_NONBLOCK: /* _SIO ('P',14) */ | 2674 | case SNDCTL_DSP_NONBLOCK: /* _SIO ('P',14) */ |
| 2675 | DBGX("SNDCTL_DSP_NONBLOCK\n"); | 2675 | DBGX("SNDCTL_DSP_NONBLOCK\n"); |
| 2676 | spin_lock(&file->f_lock); | ||
| 2676 | file->f_flags |= O_NONBLOCK; | 2677 | file->f_flags |= O_NONBLOCK; |
| 2678 | spin_unlock(&file->f_lock); | ||
| 2677 | return 0; | 2679 | return 0; |
| 2678 | 2680 | ||
| 2679 | case SNDCTL_DSP_RESET: /* _SIO ('P', 0) */ | 2681 | case SNDCTL_DSP_RESET: /* _SIO ('P', 0) */ |