Skip to content

Commit

Permalink
i2c: xlr: Fix a resource leak in the error handling path of 'xlr_i2c_…
Browse files Browse the repository at this point in the history
…probe()'

[ Upstream commit 7f98960 ]

A successful 'clk_prepare()' call should be balanced by a corresponding
'clk_unprepare()' call in the error handling path of the probe, as already
done in the remove function.

More specifically, 'clk_prepare_enable()' is used, but 'clk_disable()' is
also already called. So just the unprepare step has still to be done.

Update the error handling path accordingly.

Fixes: 75d31c2 ("i2c: xlr: add support for Sigma Designs controller variant")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
tititiou36 authored and gregkh committed Nov 17, 2021
1 parent 60e8a97 commit c64b55c
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/i2c/busses/i2c-xlr.c
Expand Up @@ -431,11 +431,15 @@ static int xlr_i2c_probe(struct platform_device *pdev)
i2c_set_adapdata(&priv->adap, priv);
ret = i2c_add_numbered_adapter(&priv->adap);
if (ret < 0)
return ret;
goto err_unprepare_clk;

platform_set_drvdata(pdev, priv);
dev_info(&priv->adap.dev, "Added I2C Bus.\n");
return 0;

err_unprepare_clk:
clk_unprepare(clk);
return ret;
}

static int xlr_i2c_remove(struct platform_device *pdev)
Expand Down

0 comments on commit c64b55c

Please sign in to comment.