Commit 194cf482 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull i2c fix from Wolfram Sang:
 "One more driver bugfix for I2C"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mv64xxx: Fix random system lock caused by runtime PM
parents 0c93ac69 39930213

drivers/i2c/busses/i2c-mv64xxx.c

+4 −0
Original line number Diff line number Diff line
@@ -221,6 +221,10 @@ mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data) 
	writel(0, drv_data->reg_base + drv_data->reg_offsets.ext_addr);

	writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,

		drv_data->reg_base + drv_data->reg_offsets.control);



	if (drv_data->errata_delay)

		udelay(5);



	drv_data->state = MV64XXX_I2C_STATE_IDLE;

}