Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
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
+3
-1
+3
-1
drivers/i2c/busses/i2c-imx.c
+3
-1
drivers/i2c/busses/i2c-imx.c
···
1169
1169
/* Init DMA config if supported */
1170
1170
ret = i2c_imx_dma_request(i2c_imx, phy_addr);
1171
1171
if (ret < 0)
1172
-
goto clk_notifier_unregister;
1172
+
goto del_adapter;
1173
1173
1174
1174
dev_info(&i2c_imx->adapter.dev, "IMX I2C adapter registered\n");
1175
1175
return 0; /* Return OK */
1176
1176
1177
+
del_adapter:
1178
+
i2c_del_adapter(&i2c_imx->adapter);
1177
1179
clk_notifier_unregister:
1178
1180
clk_notifier_unregister(i2c_imx->clk, &i2c_imx->clk_change_nb);
1179
1181
rpm_disable: