From: "Lad, Prabhakar" <prabhakar.cse...@gmail.com>

the bus_type needs to be determined only on the hsync/vsync flags,
this patch fixes the above by moving the check just after hsync/vsync
flags are being set.

Reported-by: Nikhil Devshatwar <nikhil...@ti.com>
Signed-off-by: Lad, Prabhakar <prabhakar.cse...@gmail.com>
---
 drivers/media/v4l2-core/v4l2-of.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-of.c 
b/drivers/media/v4l2-core/v4l2-of.c
index c52fb96..7f89c70 100644
--- a/drivers/media/v4l2-core/v4l2-of.c
+++ b/drivers/media/v4l2-core/v4l2-of.c
@@ -93,6 +93,11 @@ static void v4l2_of_parse_parallel_bus(const struct 
device_node *node,
                flags |= v ? V4L2_MBUS_VSYNC_ACTIVE_HIGH :
                        V4L2_MBUS_VSYNC_ACTIVE_LOW;
 
+       if (flags)
+               endpoint->bus_type = V4L2_MBUS_PARALLEL;
+       else
+               endpoint->bus_type = V4L2_MBUS_BT656;
+
        if (!of_property_read_u32(node, "pclk-sample", &v))
                flags |= v ? V4L2_MBUS_PCLK_SAMPLE_RISING :
                        V4L2_MBUS_PCLK_SAMPLE_FALLING;
@@ -100,10 +105,6 @@ static void v4l2_of_parse_parallel_bus(const struct 
device_node *node,
        if (!of_property_read_u32(node, "field-even-active", &v))
                flags |= v ? V4L2_MBUS_FIELD_EVEN_HIGH :
                        V4L2_MBUS_FIELD_EVEN_LOW;
-       if (flags)
-               endpoint->bus_type = V4L2_MBUS_PARALLEL;
-       else
-               endpoint->bus_type = V4L2_MBUS_BT656;
 
        if (!of_property_read_u32(node, "data-active", &v))
                flags |= v ? V4L2_MBUS_DATA_ACTIVE_HIGH :
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to