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

Browse source

Pull i2c fixes from Wolfram Sang:
 "Here are two more driver bugfixes for I2C which would be good to have"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: cadence: Set the hardware time-out register to maximum value
  i2c: davinci: generate STP always when NACK is received

...

This commit is contained in:

Linus Torvalds 2014-12-06 11:26:01 -08:00

parent beb5af4033 681d15a0f5

commit 15bd1e5cb3

2 changed files with 14 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

drivers/i2c/busses/i2c-cadence.c

View file

8

drivers/i2c/busses/i2c-davinci.c

View file