[v2] i2c: imx: don't leak the i2c adapter on error

Commit Message

Laurentiu Tudor April 1, 2019, 10:14 a.m. UTC

From: Laurentiu Tudor <[e-mail]>

Make sure to free the i2c adapter on the error exit path.

Signed-off-by: Laurentiu Tudor <[e-mail]>
Reviewed-by: Mukesh Ojha <[e-mail]>
Reviewed-by: Uwe Kleine-Konig <[e-mail]>
Fixes: e1ab9a468e3b ("i2c: imx: improve the error handling in i2c_imx_dma_request()")
---
Changes in v2:
 - fixed formatting glitch

 drivers/i2c/busses/i2c-imx.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Wolfram Sang April 3, 2019, 8:47 p.m. UTC | #1

On Mon, Apr 01, 2019 at 01:14:37PM +0300, [e-mail] wrote:
> From: Laurentiu Tudor <[e-mail]>
> 
> Make sure to free the i2c adapter on the error exit path.
> 
> Signed-off-by: Laurentiu Tudor <[e-mail]>
> Reviewed-by: Mukesh Ojha <[e-mail]>
> Reviewed-by: Uwe Kleine-Konig <[e-mail]>
> Fixes: e1ab9a468e3b ("i2c: imx: improve the error handling in i2c_imx_dma_request()")

Applied to for-current, thanks!

Uwe Kleine-König April 6, 2019, 3:48 p.m. UTC | #2

Hey Wolfram,

On Wed, Apr 03, 2019 at 10:47:56PM +0200, Wolfram Sang wrote:
> On Mon, Apr 01, 2019 at 01:14:37PM +0300, [e-mail] wrote:
> > From: Laurentiu Tudor <[e-mail]>
> > 
> > Make sure to free the i2c adapter on the error exit path.
> > 
> > Signed-off-by: Laurentiu Tudor <[e-mail]>
> > Reviewed-by: Mukesh Ojha <[e-mail]>
> > Reviewed-by: Uwe Kleine-Konig <[e-mail]>
> > Fixes: e1ab9a468e3b ("i2c: imx: improve the error handling in i2c_imx_dma_request()")
> 
> Applied to for-current, thanks!

Is your tree already stable? If not, would you mind correcting my name
in 9b0a9982d8b465e0394db10f15ba53f1a8d60e21?

Best regards and thanks in advance from Freiburg
Uwe

Wolfram Sang April 6, 2019, 3:58 p.m. UTC | #3

On Sat, Apr 06, 2019 at 05:48:47PM +0200, Uwe Kleine-König wrote:
> Hey Wolfram,
> 
> On Wed, Apr 03, 2019 at 10:47:56PM +0200, Wolfram Sang wrote:
> > On Mon, Apr 01, 2019 at 01:14:37PM +0300, [e-mail] wrote:
> > > From: Laurentiu Tudor <[e-mail]>
> > > 
> > > Make sure to free the i2c adapter on the error exit path.
> > > 
> > > Signed-off-by: Laurentiu Tudor <[e-mail]>
> > > Reviewed-by: Mukesh Ojha <[e-mail]>
> > > Reviewed-by: Uwe Kleine-Konig <[e-mail]>
> > > Fixes: e1ab9a468e3b ("i2c: imx: improve the error handling in i2c_imx_dma_request()")
> > 
> > Applied to for-current, thanks!
> 
> Is your tree already stable? If not, would you mind correcting my name
> in 9b0a9982d8b465e0394db10f15ba53f1a8d60e21?

It is stable, but I created an i2c/for-current-fixed branch just for you
:)

Patch

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 42fed40198a0..c0c3043b5d61 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1169,11 +1169,13 @@  static int i2c_imx_probe(struct platform_device *pdev)
 	/* Init DMA config if supported */
 	ret = i2c_imx_dma_request(i2c_imx, phy_addr);
 	if (ret < 0)
-		goto clk_notifier_unregister;
+		goto del_adapter;
 
 	dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n");
 	return 0;   /* Return OK */
 
+del_adapter:
+	i2c_del_adapter(&i2c_imx->adapter);
 clk_notifier_unregister:
 	clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
 rpm_disable: