Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fix from Wolfram Sang.

* 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: imx: Use correct function to write to register
parents 25b2398f 6c782a5e

drivers/i2c/busses/i2c-imx.c

+4 −4
Original line number Diff line number Diff line
@@ -734,9 +734,9 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx, 
		 * the first read operation, otherwise the first read cost

		 * one extra clock cycle.

		 */

		temp = readb(i2c_imx->base + IMX_I2C_I2CR);

		temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);

		temp |= I2CR_MTX;

		writeb(temp, i2c_imx->base + IMX_I2C_I2CR);

		imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);

	}

	msgs->buf[msgs->len-1] = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2DR);
@@ -857,9 +857,9 @@ static int i2c_imx_read(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs, bo 
				 * the first read operation, otherwise the first read cost

				 * one extra clock cycle.

				 */

				temp = readb(i2c_imx->base + IMX_I2C_I2CR);

				temp = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2CR);

				temp |= I2CR_MTX;

				writeb(temp, i2c_imx->base + IMX_I2C_I2CR);

				imx_i2c_write_reg(temp, i2c_imx, IMX_I2C_I2CR);

			}

		} else if (i == (msgs->len - 2)) {

			dev_dbg(&i2c_imx->adapter.dev,