summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.lad@ti.com>2012-10-03 02:25:42 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-05 14:29:20 -0300
commite32087bcc4daa29fd30cf7742ef9b522625a1690 (patch)
tree65191c5970b5f7b84906ab28790e1a18cdf84ab8 /drivers/media/platform
parentfabc4e948b0ebe128ec54687bae01f216e34bb41 (diff)
downloadblackbird-op-linux-e32087bcc4daa29fd30cf7742ef9b522625a1690.tar.gz
blackbird-op-linux-e32087bcc4daa29fd30cf7742ef9b522625a1690.zip
[media] davinci: vpbe: replace V4L2_OUT_CAP_CUSTOM_TIMINGS with V4L2_OUT_CAP_DV_TIMINGS
This patch replaces V4L2_OUT_CAP_CUSTOM_TIMINGS macro with V4L2_OUT_CAP_DV_TIMINGS. As V4L2_OUT_CAP_CUSTOM_TIMINGS is being phased out. Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/davinci/vpbe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index d03f452bd243..9b623bc0a744 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -340,7 +340,7 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev,
if (!(cfg->outputs[out_index].output.capabilities &
- V4L2_OUT_CAP_CUSTOM_TIMINGS))
+ V4L2_OUT_CAP_DV_TIMINGS))
return -EINVAL;
for (i = 0; i < output->num_modes; i++) {
@@ -408,7 +408,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev,
int j = 0;
int i;
- if (!(output->output.capabilities & V4L2_OUT_CAP_CUSTOM_TIMINGS))
+ if (!(output->output.capabilities & V4L2_OUT_CAP_DV_TIMINGS))
return -EINVAL;
for (i = 0; i < output->num_modes; i++) {
OpenPOWER on IntegriCloud