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 some bugfixes from I2C, especially removing a wrongly
  displayed error message for all i2c muxes"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: xgene: Set ACPI_COMPANION_I2C
  i2c: mv64xxx: don't override deferred probing when getting irq
  i2c: mux: only print failure message on error
  i2c: mux: reg: rename label to indicate what it does
  i2c: mux: reg: put away the parent i2c adapter on probe failure

...

This commit is contained in:

Linus Torvalds 2017-05-17 14:13:44 -07:00

parent b23afd3848 83345d51a4

commit 243bfd2c05

4 changed files with 34 additions and 20 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

6

drivers/i2c/busses/i2c-mv64xxx.c

View file

1

drivers/i2c/busses/i2c-xgene-slimpro.c

View file

26

drivers/i2c/i2c-mux.c

View file

21

drivers/i2c/muxes/i2c-mux-reg.c

View file