aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/davinci/vpif_display.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-05-01 07:03:24 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:58:54 -0400
commitffb4877ba013f94322083f77cbb05b35c2a218aa (patch)
tree0d041da73986e1dc7c845ff4418fb20f46bd7506 /drivers/media/video/davinci/vpif_display.c
parent530d2d32068eaf3616e0ce9e58a5fde5701c3380 (diff)
V4L/DVB: v4l2-common: simplify prio utility functions
v4l2_prio_init/open/close returned an int when in fact they would always return 0. Make these void functions. v4l2_prio_close and v4l2_prio_check pass an enum v4l2_priority as a pointer for no good reason. Replace with a normal enum v4l2_priority argument. These changes will simplify the work of moving priority handling into the v4l core. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/davinci/vpif_display.c')
-rw-r--r--drivers/media/video/davinci/vpif_display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index e5bab3d0d53f..da07607cbc55 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -671,7 +671,7 @@ static int vpif_release(struct file *filep)
671 ch->initialized = 0; 671 ch->initialized = 0;
672 672
673 /* Close the priority */ 673 /* Close the priority */
674 v4l2_prio_close(&ch->prio, &fh->prio); 674 v4l2_prio_close(&ch->prio, fh->prio);
675 filep->private_data = NULL; 675 filep->private_data = NULL;
676 fh->initialized = 0; 676 fh->initialized = 0;
677 kfree(fh); 677 kfree(fh);
@@ -753,7 +753,7 @@ static int vpif_s_fmt_vid_out(struct file *file, void *priv,
753 } 753 }
754 754
755 /* Check for the priority */ 755 /* Check for the priority */
756 ret = v4l2_prio_check(&ch->prio, &fh->prio); 756 ret = v4l2_prio_check(&ch->prio, fh->prio);
757 if (0 != ret) 757 if (0 != ret)
758 return ret; 758 return ret;
759 fh->initialized = 1; 759 fh->initialized = 1;