From 256bba5cba5755b60440f547561a721cbd364e0e Mon Sep 17 00:00:00 2001 From: "Lad, Prabhakar" Date: Wed, 3 Oct 2012 02:25:42 -0300 Subject: [PATCH] --- yaml --- r: 333751 b: refs/heads/master c: e32087bcc4daa29fd30cf7742ef9b522625a1690 h: refs/heads/master i: 333749: 2f1fd48faa4730d9377aecefc277e1bf96d8f69f 333747: c6eeea47f11d99a1b31d98c40024b9711f0f1792 333743: 81a4f0365d5cbab379bae29f7f375eada966a595 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- trunk/drivers/media/platform/davinci/vpbe.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e376348dd971..923ebf439207 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fabc4e948b0ebe128ec54687bae01f216e34bb41 +refs/heads/master: e32087bcc4daa29fd30cf7742ef9b522625a1690 diff --git a/trunk/arch/arm/mach-davinci/board-dm644x-evm.c b/trunk/arch/arm/mach-davinci/board-dm644x-evm.c index 3baf56d0a84f..a79dc1e7cf72 100644 --- a/trunk/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/trunk/arch/arm/mach-davinci/board-dm644x-evm.c @@ -699,7 +699,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = { .index = 1, .name = "Component", .type = V4L2_OUTPUT_TYPE_ANALOG, - .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS, + .capabilities = V4L2_OUT_CAP_DV_TIMINGS, }, .subdev_name = VPBE_VENC_SUBDEV_NAME, .default_mode = "480p59_94", diff --git a/trunk/drivers/media/platform/davinci/vpbe.c b/trunk/drivers/media/platform/davinci/vpbe.c index d03f452bd243..9b623bc0a744 100644 --- a/trunk/drivers/media/platform/davinci/vpbe.c +++ b/trunk/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++) {