Merge tag 'i3c/for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Mar 2019 03:05:02 +0000 (19:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Mar 2019 03:05:02 +0000 (19:05 -0800)
Pull i3c updates from Boris Brezillon:

 - Add a /* fall-through */ comment in the dw-i3c-master driver

 - Update the I3C entries in MAINTAINERS to add an IRC chan

* tag 'i3c/for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: master: dw-i3c-master: mark expected switch fall-through
  MAINTAINERS: Add an IRC channel for the I3C subsystem

MAINTAINERS
drivers/i3c/master/dw-i3c-master.c

index b40ec3f..f105073 100644 (file)
@@ -7176,6 +7176,7 @@ F:        drivers/i2c/i2c-stub.c
 I3C SUBSYSTEM
 M:     Boris Brezillon <bbrezillon@kernel.org>
 L:     linux-i3c@lists.infradead.org
+C:     irc://chat.freenode.net/linux-i3c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-i3c
index bb03079..5927922 100644 (file)
@@ -602,6 +602,7 @@ static int dw_i3c_master_bus_init(struct i3c_master_controller *m)
                ret = dw_i2c_clk_cfg(master);
                if (ret)
                        return ret;
+               /* fall through */
        case I3C_BUS_MODE_PURE:
                ret = dw_i3c_clk_cfg(master);
                if (ret)