diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-01-05 08:31:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-01-05 08:31:08 +1000 |
| commit | 4f125010d2d02c481a0fdf5aee23a9f937bc5de1 (patch) | |
| tree | dcdcd2ba1d0bb980b57ced9a1b2b5b17c84c8f57 /drivers/media/video/cx18/cx18-alsa-pcm.c | |
| parent | 204663c48711ddceee09df46269cd34d49d1f7be (diff) | |
| parent | 989d873fc5b6a96695b97738dea8d9f02a60f8ab (diff) | |
| download | kernel_samsung_smdk4412-4f125010d2d02c481a0fdf5aee23a9f937bc5de1.zip kernel_samsung_smdk4412-4f125010d2d02c481a0fdf5aee23a9f937bc5de1.tar.gz kernel_samsung_smdk4412-4f125010d2d02c481a0fdf5aee23a9f937bc5de1.tar.bz2 | |
Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next
Diffstat (limited to 'drivers/media/video/cx18/cx18-alsa-pcm.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-alsa-pcm.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c index 8f55692..82d195b 100644 --- a/drivers/media/video/cx18/cx18-alsa-pcm.c +++ b/drivers/media/video/cx18/cx18-alsa-pcm.c @@ -218,7 +218,13 @@ static int snd_cx18_pcm_capture_close(struct snd_pcm_substream *substream) static int snd_cx18_pcm_ioctl(struct snd_pcm_substream *substream, unsigned int cmd, void *arg) { - return snd_pcm_lib_ioctl(substream, cmd, arg); + struct snd_cx18_card *cxsc = snd_pcm_substream_chip(substream); + int ret; + + snd_cx18_lock(cxsc); + ret = snd_pcm_lib_ioctl(substream, cmd, arg); + snd_cx18_unlock(cxsc); + return ret; } |