Commit a56b3e15 authored by Frieder Schrempf's avatar Frieder Schrempf Committed by Hans Verkuil

media: imx: imx7-media-csi: Fix error handling in imx7_csi_async_register()

The CSI requires a connected source subdev to operate. If
fwnode_graph_get_endpoint_by_id() fails and returns NULL, there is no
point in going on. Print an error message and abort instead.

Also we don't need to check for an existing asd. Any failure of
v4l2_async_nf_add_fwnode_remote() should abort the probe.
Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarFrieder Schrempf <frieder.schrempf@kontron.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 7cfb35d3
......@@ -2107,18 +2107,21 @@ static int imx7_csi_async_register(struct imx7_csi *csi)
ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(csi->dev), 0, 0,
FWNODE_GRAPH_ENDPOINT_NEXT);
if (ep) {
asd = v4l2_async_nf_add_fwnode_remote(&csi->notifier, ep,
struct v4l2_async_subdev);
if (!ep) {
ret = dev_err_probe(csi->dev, -ENOTCONN,
"Failed to get remote endpoint\n");
goto error;
}
fwnode_handle_put(ep);
asd = v4l2_async_nf_add_fwnode_remote(&csi->notifier, ep,
struct v4l2_async_subdev);
if (IS_ERR(asd)) {
ret = PTR_ERR(asd);
/* OK if asd already exists */
if (ret != -EEXIST)
goto error;
}
fwnode_handle_put(ep);
if (IS_ERR(asd)) {
ret = dev_err_probe(csi->dev, PTR_ERR(asd),
"Failed to add remote subdev to notifier\n");
goto error;
}
csi->notifier.ops = &imx7_csi_notify_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment