Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux (faac51dd) · Commits · 戴 / test

Pull i2c fix from Wolfram Sang: "A simple but wanted driver bugfix" * 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: imx: don't leak the i2c adapter on error

drivers/i2c/busses/i2c-imx.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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: