OSDN Git Service

media: v4l2-fwnode: fix v4l2_fwnode_parse_link handling
authorMarco Felsch <m.felsch@pengutronix.de>
Thu, 12 Mar 2020 10:31:39 +0000 (11:31 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Thu, 12 Mar 2020 15:30:25 +0000 (16:30 +0100)
Currently the driver differentiate the port number property handling for
ACPI and DT. This is wrong as because ACPI should use the "reg" val too
[1].

[1] https://patchwork.kernel.org/patch/11421985/

Fixes: ca50c197bd96 ("[media] v4l: fwnode: Support generic fwnode for parsing standardised properties")
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/v4l2-core/v4l2-fwnode.c

index 6ece432..d56eee9 100644 (file)
@@ -560,7 +560,7 @@ EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_alloc_parse);
 int v4l2_fwnode_parse_link(struct fwnode_handle *__fwnode,
                           struct v4l2_fwnode_link *link)
 {
-       const char *port_prop = is_of_node(__fwnode) ? "reg" : "port";
+       const char *port_prop = "reg";
        struct fwnode_handle *fwnode;
 
        memset(link, 0, sizeof(*link));