media: v4l2-fwnode: Fix setting V4L2_MBUS_DATA_ACTIVE_HIGH/LOW flag
authorOndrej Jirman <megous@megous.com>
Fri, 7 Dec 2018 15:56:01 +0000 (10:56 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 12 Dec 2018 17:19:39 +0000 (12:19 -0500)
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: stable@vger.kernel.org # for Kernel 4.20
Signed-off-by: Ondrej Jirman <megous@megous.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/v4l2-core/v4l2-fwnode.c

index f0a6c0c6f1625707522df4c452941468339cd7fc..9bfedd7596a1a3616368f63902624fb27c603285 100644 (file)
@@ -310,8 +310,8 @@ v4l2_fwnode_endpoint_parse_parallel_bus(struct fwnode_handle *fwnode,
        }
 
        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");