Use devm_add_action_or_reset() to release resources in case of failure, because the cleanup function will be automatically called. Signed-off-by: He Lugang <helugang@xxxxxxxxxxxxx> --- drivers/gpu/drm/i2c/tda9950.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c index 82d618c40dce..e9dae19d7acd 100644 --- a/drivers/gpu/drm/i2c/tda9950.c +++ b/drivers/gpu/drm/i2c/tda9950.c @@ -361,11 +361,7 @@ static int tda9950_devm_glue_init(struct device *dev, struct tda9950_glue *glue) return ret; } - ret = devm_add_action(dev, tda9950_devm_glue_exit, glue); - if (ret) - tda9950_devm_glue_exit(glue); - - return ret; + return devm_add_action_or_reset(dev, tda9950_devm_glue_exit, glue); } static void tda9950_cec_del(void *data) @@ -425,11 +421,9 @@ static int tda9950_probe(struct i2c_client *client) if (IS_ERR(priv->adap)) return PTR_ERR(priv->adap); - ret = devm_add_action(dev, tda9950_cec_del, priv); - if (ret) { - cec_delete_adapter(priv->adap); + ret = devm_add_action_or_reset(dev, tda9950_cec_del, priv); + if (ret) return ret; - } ret = tda9950_devm_glue_init(dev, glue); if (ret) -- 2.45.2