From 32593dd0380929a871f49e1c5a401b2c8aff2823 Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Wed, 18 Jul 2018 09:20:34 -0400 Subject: [PATCH] media: v4l: fwnode: Parse the graph endpoint as last Parsing the graph endpoint is always successful; therefore parse it as last. Signed-off-by: Sakari Ailus Tested-by: Steve Longerbeam Tested-by: Jacopo Mondi Signed-off-by: Mauro Carvalho Chehab --- drivers/media/v4l2-core/v4l2-fwnode.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index caf4aa964cbd..5f3bb3d1191c 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -303,7 +303,11 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, pr_debug("===== begin V4L2 endpoint properties\n"); - fwnode_graph_parse_endpoint(fwnode, &vep->base); + /* + * Zero the fwnode graph endpoint memory in case we don't end up parsing + * the endpoint. + */ + memset(&vep->base, 0, sizeof(vep->base)); /* Zero fields from bus_type to until the end */ memset(&vep->bus_type, 0, sizeof(*vep) - @@ -346,6 +350,8 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode, return -EINVAL; } + fwnode_graph_parse_endpoint(fwnode, &vep->base); + return 0; } -- 2.30.2