diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-05 04:05:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-05 04:05:02 +0100 |
| commit | c8d950ab24987cad4fb4de60c554ac12c2658991 (patch) | |
| tree | 5f9b65859b060b7cb0cd4763f4ffa32fff91ddeb | |
| parent | Merge tag 'mtd/for-5.1' of git://git.infradead.org/linux-mtd (diff) | |
| parent | i3c: master: dw-i3c-master: mark expected switch fall-through (diff) | |
| download | linux-c8d950ab24987cad4fb4de60c554ac12c2658991.tar.xz linux-c8d950ab24987cad4fb4de60c554ac12c2658991.zip | |
Merge tag 'i3c/for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux
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
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/i3c/master/dw-i3c-master.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b40ec3f4b943..f1050734d909 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/i3c/master/dw-i3c-master.c b/drivers/i3c/master/dw-i3c-master.c index bb03079fbade..59279224e07f 100644 --- a/drivers/i3c/master/dw-i3c-master.c +++ b/drivers/i3c/master/dw-i3c-master.c @@ -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) |