Message ID | 20200418170703.1583-4-digetx@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | [v5,1/6] of_graph: add of_graph_get_local_port() | expand |
On Sat, Apr 18, 2020 at 08:07:00PM +0300, Dmitry Osipenko wrote: > The OF node should be put before returning error in tegra_output_probe(), > otherwise node's refcount will be leaked. > > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> > --- > drivers/gpu/drm/tegra/output.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c > index e36e5e7c2f69..a6a711d54e88 100644 > --- a/drivers/gpu/drm/tegra/output.c > +++ b/drivers/gpu/drm/tegra/output.c > @@ -102,10 +102,10 @@ int tegra_output_probe(struct tegra_output *output) > panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); > if (panel) { > output->panel = of_drm_find_panel(panel); > + of_node_put(panel); > + > if (IS_ERR(output->panel)) > return PTR_ERR(output->panel); > - > - of_node_put(panel); > } > > output->edid = of_get_property(output->of_node, "nvidia,edid", &size); > @@ -113,13 +113,12 @@ int tegra_output_probe(struct tegra_output *output) > ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0); > if (ddc) { > output->ddc = of_find_i2c_adapter_by_node(ddc); > + of_node_put(ddc); > + > if (!output->ddc) { > err = -EPROBE_DEFER; > - of_node_put(ddc); > return err; > } > - > - of_node_put(ddc); > } > > output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev, > -- > 2.26.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index e36e5e7c2f69..a6a711d54e88 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -102,10 +102,10 @@ int tegra_output_probe(struct tegra_output *output) panel = of_parse_phandle(output->of_node, "nvidia,panel", 0); if (panel) { output->panel = of_drm_find_panel(panel); + of_node_put(panel); + if (IS_ERR(output->panel)) return PTR_ERR(output->panel); - - of_node_put(panel); } output->edid = of_get_property(output->of_node, "nvidia,edid", &size); @@ -113,13 +113,12 @@ int tegra_output_probe(struct tegra_output *output) ddc = of_parse_phandle(output->of_node, "nvidia,ddc-i2c-bus", 0); if (ddc) { output->ddc = of_find_i2c_adapter_by_node(ddc); + of_node_put(ddc); + if (!output->ddc) { err = -EPROBE_DEFER; - of_node_put(ddc); return err; } - - of_node_put(ddc); } output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev,