aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-fileops.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2011-03-12 04:36:08 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 15:38:04 -0400
commita64bb4b7111e063154f97ff64dab03144cdfb5d9 (patch)
treeddfede98c2436d588d41c101e0e78756e7c635a0 /drivers/media/video/cx18/cx18-fileops.c
parent0b5f265a88d89cbbf8abc42ca3311cb3219162ab (diff)
[media] cx18: use core priority handling
VIDIOC_S/G_PRIORITY handling is now done by the v4l2 core framework. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-fileops.c')
-rw-r--r--drivers/media/video/cx18/cx18-fileops.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c
index 1172d68925c0..e9802d99439b 100644
--- a/drivers/media/video/cx18/cx18-fileops.c
+++ b/drivers/media/video/cx18/cx18-fileops.c
@@ -683,7 +683,6 @@ int cx18_v4l2_close(struct file *filp)
683 683
684 CX18_DEBUG_IOCTL("close() of %s\n", s->name); 684 CX18_DEBUG_IOCTL("close() of %s\n", s->name);
685 685
686 v4l2_prio_close(&cx->prio, id->prio);
687 v4l2_fh_del(fh); 686 v4l2_fh_del(fh);
688 v4l2_fh_exit(fh); 687 v4l2_fh_exit(fh);
689 688
@@ -740,7 +739,6 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp)
740 739
741 item->cx = cx; 740 item->cx = cx;
742 item->type = s->type; 741 item->type = s->type;
743 v4l2_prio_open(&cx->prio, &item->prio);
744 742
745 item->open_id = cx->open_id++; 743 item->open_id = cx->open_id++;
746 filp->private_data = &item->fh; 744 filp->private_data = &item->fh;