From 7bccff1a30d8a99729d2ccd8d596adafdb4c2cc6 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 20 Sep 2012 09:06:22 -0300 Subject: [PATCH] --- yaml --- r: 333772 b: refs/heads/master c: 6f47c6c69cd45d9e57458e31528628af2d346f73 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/davinci/vpif_capture.c | 9 ++------- trunk/drivers/media/platform/davinci/vpif_capture.h | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 0b051763d04d..9f0165b07be2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cfee2daf9fe9dc514c29f7e7fb35c17136771d2 +refs/heads/master: 6f47c6c69cd45d9e57458e31528628af2d346f73 diff --git a/trunk/drivers/media/platform/davinci/vpif_capture.c b/trunk/drivers/media/platform/davinci/vpif_capture.c index 8dbbd4bffb84..834510679c6d 100644 --- a/trunk/drivers/media/platform/davinci/vpif_capture.c +++ b/trunk/drivers/media/platform/davinci/vpif_capture.c @@ -888,8 +888,6 @@ static int vpif_open(struct file *filep) if (vpif_obj.sd[i]) { /* the sub device is registered */ ch->curr_subdev_info = &config->subdev_info[i]; - /* make first input as the current input */ - vid_ch->input_idx = 0; break; } } @@ -1442,10 +1440,8 @@ static int vpif_g_input(struct file *file, void *priv, unsigned int *index) { struct vpif_fh *fh = priv; struct channel_obj *ch = fh->channel; - struct video_obj *vid_ch = &ch->video; - - *index = vid_ch->input_idx; + *index = ch->input_idx; return 0; } @@ -1462,7 +1458,6 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index) struct vpif_fh *fh = priv; struct channel_obj *ch = fh->channel; struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX]; - struct video_obj *vid_ch = &ch->video; struct vpif_subdev_info *subdev_info; int ret = 0, sd_index = 0; u32 input = 0, output = 0; @@ -1517,7 +1512,7 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index) return ret; } } - vid_ch->input_idx = index; + ch->input_idx = index; ch->curr_subdev_info = subdev_info; ch->curr_sd_index = sd_index; /* copy interface parameters to vpif */ diff --git a/trunk/drivers/media/platform/davinci/vpif_capture.h b/trunk/drivers/media/platform/davinci/vpif_capture.h index 1bc9d8bdd756..760964c56879 100644 --- a/trunk/drivers/media/platform/davinci/vpif_capture.h +++ b/trunk/drivers/media/platform/davinci/vpif_capture.h @@ -54,8 +54,6 @@ struct video_obj { /* Currently selected or default standard */ v4l2_std_id stdid; struct v4l2_dv_timings dv_timings; - /* This is to track the last input that is passed to application */ - u32 input_idx; }; struct vpif_cap_buffer { @@ -121,6 +119,8 @@ struct channel_obj { enum vpif_channel_id channel_id; /* index into sd table */ int curr_sd_index; + /* Current input */ + u32 input_idx; /* ptr to current sub device information */ struct vpif_subdev_info *curr_subdev_info; /* vpif configuration params */