From: Sakari Ailus Date: Tue, 28 Feb 2017 11:53:27 +0000 (-0500) Subject: media: omap3isp: Ignore endpoints with invalid configuration X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=58f6d3675a2c423a95739ad6719607a7681af954;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git media: omap3isp: Ignore endpoints with invalid configuration If endpoint has an invalid configuration, ignore it instead of happily proceeding to use it nonetheless. Ignoring such an endpoint is better than failing since there could be multiple endpoints, only some of which are bad. Signed-off-by: Sakari Ailus Tested-by: Pavel Machek Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index dbaede0d8974..2de7a27bb0e5 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -2111,10 +2111,12 @@ static int isp_fwnodes_parse(struct device *dev, if (!isd) goto error; - notifier->subdevs[notifier->num_subdevs] = &isd->asd; + if (isp_fwnode_parse(dev, fwnode, isd)) { + devm_kfree(dev, isd); + continue; + } - if (isp_fwnode_parse(dev, fwnode, isd)) - goto error; + notifier->subdevs[notifier->num_subdevs] = &isd->asd; isd->asd.match.fwnode.fwnode = fwnode_graph_get_remote_port_parent(fwnode);