| Message ID | 16e7c6e94a61e6fc2d65db61620955c388798dbb.1640730512.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/bridge: sn65dsi83: Fix an error handling path in sn65dsi83_probe() | expand |
Hi Christophe, Thank you for the patch. On Tue, Dec 28, 2021 at 11:37:25PM +0100, Christophe JAILLET wrote: > sn65dsi83_parse_dt() takes a reference on 'ctx->host_node' that must be > released in the error handling path of the probe. > This is only done in the remove function up to now. > > Fixes: ceb515ba29ba ("drm/bridge: ti-sn65dsi83: Add TI SN65DSI83 and SN65DSI84 driver") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/gpu/drm/bridge/ti-sn65dsi83.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c > index 945f08de45f1..6edea9f8f8c4 100644 > --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c > +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c > @@ -673,8 +673,10 @@ static int sn65dsi83_probe(struct i2c_client *client, > return ret; > > ctx->regmap = devm_regmap_init_i2c(client, &sn65dsi83_regmap_config); > - if (IS_ERR(ctx->regmap)) > - return PTR_ERR(ctx->regmap); > + if (IS_ERR(ctx->regmap)) { > + ret = PTR_ERR(ctx->regmap); > + goto err_put_node; > + } There's another similar issue if sn65dsi83_parse_dt() fails. Would you mind fixing them all in the same patch ? > > dev_set_drvdata(dev, ctx); > i2c_set_clientdata(client, ctx); > @@ -691,6 +693,8 @@ static int sn65dsi83_probe(struct i2c_client *client, > > err_remove_bridge: > drm_bridge_remove(&ctx->bridge); > +err_put_node: > + of_node_put(ctx->host_node); > return ret; > } >
diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c b/drivers/gpu/drm/bridge/ti-sn65dsi83.c index 945f08de45f1..6edea9f8f8c4 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c @@ -673,8 +673,10 @@ static int sn65dsi83_probe(struct i2c_client *client, return ret; ctx->regmap = devm_regmap_init_i2c(client, &sn65dsi83_regmap_config); - if (IS_ERR(ctx->regmap)) - return PTR_ERR(ctx->regmap); + if (IS_ERR(ctx->regmap)) { + ret = PTR_ERR(ctx->regmap); + goto err_put_node; + } dev_set_drvdata(dev, ctx); i2c_set_clientdata(client, ctx); @@ -691,6 +693,8 @@ static int sn65dsi83_probe(struct i2c_client *client, err_remove_bridge: drm_bridge_remove(&ctx->bridge); +err_put_node: + of_node_put(ctx->host_node); return ret; }
sn65dsi83_parse_dt() takes a reference on 'ctx->host_node' that must be released in the error handling path of the probe. This is only done in the remove function up to now. Fixes: ceb515ba29ba ("drm/bridge: ti-sn65dsi83: Add TI SN65DSI83 and SN65DSI84 driver") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)