lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 320/700] media: video-mux: Skip dangling endpoints
    Date
    From: Philipp Zabel <p.zabel@pengutronix.de>

    [ Upstream commit 95778c2d0979618e3349b1d2324ec282a5a6adbf ]

    i.MX6 device tree include files contain dangling endpoints for the
    board device tree writers' convenience. These are still included in
    many existing device trees.
    Treat dangling endpoints as non-existent to support them.

    Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Fixes: 612b385efb1e ("media: video-mux: Create media links in bound notifier")
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/video-mux.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c
    index 133122e38515..9bc0b4d8de09 100644
    --- a/drivers/media/platform/video-mux.c
    +++ b/drivers/media/platform/video-mux.c
    @@ -362,7 +362,7 @@ static int video_mux_async_register(struct video_mux *vmux,

    for (i = 0; i < num_input_pads; i++) {
    struct v4l2_async_subdev *asd;
    - struct fwnode_handle *ep;
    + struct fwnode_handle *ep, *remote_ep;

    ep = fwnode_graph_get_endpoint_by_id(
    dev_fwnode(vmux->subdev.dev), i, 0,
    @@ -370,6 +370,14 @@ static int video_mux_async_register(struct video_mux *vmux,
    if (!ep)
    continue;

    + /* Skip dangling endpoints for backwards compatibility */
    + remote_ep = fwnode_graph_get_remote_endpoint(ep);
    + if (!remote_ep) {
    + fwnode_handle_put(ep);
    + continue;
    + }
    + fwnode_handle_put(remote_ep);
    +
    asd = v4l2_async_notifier_add_fwnode_remote_subdev(
    &vmux->notifier, ep, struct v4l2_async_subdev);

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:40    [W:3.252 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site