From 153cbfc8bdc55642578d0b513c04496ee27b6430 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Mon, 16 Oct 2023 10:18:29 +0300 Subject: [PATCH] media: ivsc: csi: Don't parse remote endpoints The driver parsed, besides its own endpoint on the sink, the remote upstream endpoint that most likely is a sensor, and took the number of lanes from that. Instead obtain the number of lanes from the local endpoint. Signed-off-by: Sakari Ailus Tested-by: Wentong Wu Signed-off-by: Hans Verkuil --- drivers/media/pci/intel/ivsc/mei_csi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c b/drivers/media/pci/intel/ivsc/mei_csi.c index 2a6b828fd8dd..790b1101d579 100644 --- a/drivers/media/pci/intel/ivsc/mei_csi.c +++ b/drivers/media/pci/intel/ivsc/mei_csi.c @@ -662,6 +662,8 @@ static int mei_csi_parse_firmware(struct mei_csi *csi) return -EINVAL; } + csi->nr_of_lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes; + fwnode = fwnode_graph_get_remote_endpoint(ep); fwnode_handle_put(ep); @@ -675,18 +677,12 @@ static int mei_csi_parse_firmware(struct mei_csi *csi) return PTR_ERR(asd); } - ret = v4l2_fwnode_endpoint_alloc_parse(fwnode, &v4l2_ep); fwnode_handle_put(fwnode); - if (ret) - return ret; - csi->nr_of_lanes = v4l2_ep.bus.mipi_csi2.num_data_lanes; ret = v4l2_async_nf_register(&csi->notifier); if (ret) v4l2_async_nf_cleanup(&csi->notifier); - v4l2_fwnode_endpoint_free(&v4l2_ep); - return ret; }