aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-fileops.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-03-10 15:59:15 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-04-27 14:44:28 -0400
commitd46c17d7aa12e30b612acae35535fcd64f2db3d6 (patch)
treebf26772f7ae285baa938f77eae98d0b337f9af5f /drivers/media/video/ivtv/ivtv-fileops.c
parenta542fe47fe3f758e47d71640e7ca328c032a13e1 (diff)
V4L/DVB (5410): Add VIDIOC_G/S_PRIORITY support to ivtv.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-fileops.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-fileops.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index 2f38bb14ace9..1637097ddec7 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -766,6 +766,8 @@ int ivtv_v4l2_close(struct inode *inode, struct file *filp)
766 766
767 IVTV_DEBUG_IOCTL("close() of %s\n", s->name); 767 IVTV_DEBUG_IOCTL("close() of %s\n", s->name);
768 768
769 v4l2_prio_close(&itv->prio, &id->prio);
770
769 /* Easy case first: this stream was never claimed by us */ 771 /* Easy case first: this stream was never claimed by us */
770 if (s->id != id->open_id) { 772 if (s->id != id->open_id) {
771 kfree(id); 773 kfree(id);
@@ -849,6 +851,7 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp)
849 } 851 }
850 item->itv = itv; 852 item->itv = itv;
851 item->type = y; 853 item->type = y;
854 v4l2_prio_open(&itv->prio, &item->prio);
852 855
853 item->open_id = itv->open_id++; 856 item->open_id = itv->open_id++;
854 filp->private_data = item; 857 filp->private_data = item;