]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
media: hi556: Return -EPROBE_DEFER if no endpoint is found
authorHans de Goede <hdegoede@redhat.com>
Mon, 15 Apr 2024 13:10:35 +0000 (15:10 +0200)
committerHans Verkuil <hverkuil-cisco@xs4all.nl>
Mon, 22 Apr 2024 09:41:05 +0000 (11:41 +0200)
With ipu bridge, endpoints may only be created when ipu bridge has
initialised. This may happen after the sensor driver has first probed.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
drivers/media/i2c/hi556.c

index 38c77d51578675bcf63066aca2225ef9ad73eda2..c54cd49e56a1d2463d08ae8d66d22e9749ddd973 100644 (file)
@@ -1206,8 +1206,18 @@ static int hi556_check_hwcfg(struct device *dev)
        int ret = 0;
        unsigned int i, j;
 
-       if (!fwnode)
-               return -ENXIO;
+       /*
+        * Sometimes the fwnode graph is initialized by the bridge driver,
+        * wait for this.
+        */
+       ep = fwnode_graph_get_next_endpoint(fwnode, NULL);
+       if (!ep)
+               return -EPROBE_DEFER;
+
+       ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg);
+       fwnode_handle_put(ep);
+       if (ret)
+               return ret;
 
        ret = fwnode_property_read_u32(fwnode, "clock-frequency", &mclk);
        if (ret) {
@@ -1220,15 +1230,6 @@ static int hi556_check_hwcfg(struct device *dev)
                return -EINVAL;
        }
 
-       ep = fwnode_graph_get_next_endpoint(fwnode, NULL);
-       if (!ep)
-               return -ENXIO;
-
-       ret = v4l2_fwnode_endpoint_alloc_parse(ep, &bus_cfg);
-       fwnode_handle_put(ep);
-       if (ret)
-               return ret;
-
        if (bus_cfg.bus.mipi_csi2.num_data_lanes != 2) {
                dev_err(dev, "number of CSI2 data lanes %d is not supported",
                        bus_cfg.bus.mipi_csi2.num_data_lanes);