1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c
index 4185bcb80ca3..9d598ab88615 100644
--- a/drivers/media/video/cx18/cx18-streams.c
+++ b/drivers/media/video/cx18/cx18-streams.c
@@ -40,8 +40,7 @@ static struct v4l2_file_operations cx18_v4l2_enc_fops = {
         .owner = THIS_MODULE,
         .read = cx18_v4l2_read,
         .open = cx18_v4l2_open,
-        /* FIXME change to video_ioctl2 if serialization lock can be removed */
-        .unlocked_ioctl = cx18_v4l2_ioctl,
+        .unlocked_ioctl = video_ioctl2,
         .release = cx18_v4l2_close,
         .poll = cx18_v4l2_enc_poll,
         .mmap = cx18_v4l2_mmap,
@@ -376,6 +375,7 @@ static int cx18_prep_dev(struct cx18 *cx, int type)
         s->video_dev->fops = &cx18_v4l2_enc_fops;
         s->video_dev->release = video_device_release;
         s->video_dev->tvnorms = V4L2_STD_ALL;
+        s->video_dev->lock = &cx->serialize_lock;
         set_bit(V4L2_FL_USE_FH_PRIO, &s->video_dev->flags);
         cx18_set_funcs(s->video_dev);
         return 0;