4.20-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Ondrej Jirman <[email protected]>

commit fa09d06522ceac428fdc5c2b57c572f6cfd0a8bb upstream.

When parallel bus is used and data-active is being parsed, incorrect
flags are cleared.

Clear the correct flag bits.

Fixes: e9be1b863e2c2948deb003df8edd9635b4611a8a (media: v4l: fwnode:
Use default parallel flags).

Cc: [email protected] # for Kernel 4.20
Signed-off-by: Ondrej Jirman <[email protected]>
Signed-off-by: Sakari Ailus <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/media/v4l2-core/v4l2-fwnode.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -310,8 +310,8 @@ v4l2_fwnode_endpoint_parse_parallel_bus(
        }
 
        if (!fwnode_property_read_u32(fwnode, "data-active", &v)) {
-               flags &= ~(V4L2_MBUS_PCLK_SAMPLE_RISING |
-                          V4L2_MBUS_PCLK_SAMPLE_FALLING);
+               flags &= ~(V4L2_MBUS_DATA_ACTIVE_HIGH |
+                          V4L2_MBUS_DATA_ACTIVE_LOW);
                flags |= v ? V4L2_MBUS_DATA_ACTIVE_HIGH :
                        V4L2_MBUS_DATA_ACTIVE_LOW;
                pr_debug("data-active %s\n", v ? "high" : "low");


Reply via email to