Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
+4
drivers/i2c/busses/i2c-mv64xxx.c
+4
drivers/i2c/busses/i2c-mv64xxx.c
···
221
221
writel(0, drv_data->reg_base + drv_data->reg_offsets.ext_addr);
222
222
writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP,
223
223
drv_data->reg_base + drv_data->reg_offsets.control);
224
+
225
+
if (drv_data->errata_delay)
226
+
udelay(5);
227
+
224
228
drv_data->state = MV64XXX_I2C_STATE_IDLE;
225
229
}
226
230