aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-20 09:06:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-05 22:09:57 -0300
commit0d4f35f3f0044303abfff57441dd1e98f96ea935 (patch)
tree5bdae27a3bc2c84c581d973e4d34195a8a272b0b /drivers/media
parent[media] vpif_display: use a v4l2_subdev pointer to call a subdev (diff)
downloadlinux-dev-0d4f35f3f0044303abfff57441dd1e98f96ea935.tar.xz
linux-dev-0d4f35f3f0044303abfff57441dd1e98f96ea935.zip
[media] davinci: move struct vpif_interface to chan_cfg
struct vpif_interface is channel specific, not subdev specific. Move it to the channel config. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sekhar Nori <nsekhar@ti.com> Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com> Tested-by: Lad, Prabhakar <prabhakar.lad@ti.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/davinci/vpif_capture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index c4db0ef91595..83b80baf868a 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1310,7 +1310,7 @@ static int vpif_set_input(
ch->input_idx = index;
ch->sd = sd;
/* copy interface parameters to vpif */
- ch->vpifparams.iface = subdev_info->vpif_if;
+ ch->vpifparams.iface = chan_cfg->vpif_if;
/* update tvnorms from the sub device input info */
ch->video_dev->tvnorms = chan_cfg->inputs[index].input.std;