Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78b055be authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4f68775b

drivers/media/video/cx18/cx18-alsa-pcm.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/media/video/cx18/cx18-streams.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct v4l2_file_operations cx18_v4l2_enc_fops = { 
	.read = cx18_v4l2_read,

	.open = cx18_v4l2_open,

	/* FIXME change to video_ioctl2 if serialization lock can be removed */

	.ioctl = cx18_v4l2_ioctl,

	.unlocked_ioctl = cx18_v4l2_ioctl,

	.release = cx18_v4l2_close,

	.poll = cx18_v4l2_enc_poll,

};