[media] cx18: convert to unlocked_ioctl
Also added locking around snd_cx18_pcm_ioctl as a precaution as requested by Andy Walls. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
4f68775b7d
commit
78b055be27
2 changed files with 8 additions and 2 deletions
|
@ -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,
|
static int snd_cx18_pcm_ioctl(struct snd_pcm_substream *substream,
|
||||||
unsigned int cmd, void *arg)
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ static struct v4l2_file_operations cx18_v4l2_enc_fops = {
|
||||||
.read = cx18_v4l2_read,
|
.read = cx18_v4l2_read,
|
||||||
.open = cx18_v4l2_open,
|
.open = cx18_v4l2_open,
|
||||||
/* FIXME change to video_ioctl2 if serialization lock can be removed */
|
/* FIXME change to video_ioctl2 if serialization lock can be removed */
|
||||||
.ioctl = cx18_v4l2_ioctl,
|
.unlocked_ioctl = cx18_v4l2_ioctl,
|
||||||
.release = cx18_v4l2_close,
|
.release = cx18_v4l2_close,
|
||||||
.poll = cx18_v4l2_enc_poll,
|
.poll = cx18_v4l2_enc_poll,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue