Commit f5459048 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-7.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fix from Wolfram Sang:

 - imx: set dma_slave_config to 0 and avoid uninitialized fields

* tag 'i2c-for-7.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: imx: zero-initialize dma_slave_config for eDMA
parents e753c16c 0637a308

drivers/i2c/busses/i2c-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static void i2c_imx_reset_regs(struct imx_i2c_struct *i2c_imx) 
static int i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, dma_addr_t phy_addr)

{

	struct imx_i2c_dma *dma;

	struct dma_slave_config dma_sconfig;

	struct dma_slave_config dma_sconfig = {};

	struct device *dev = i2c_imx->adapter.dev.parent;

	int ret;