diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-04 10:30:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-04 10:30:47 -0700 |
| commit | 4b6f23161b4e888e72671e377c32eabe9a8e62fc (patch) | |
| tree | 02bc9ce1e9ab4c304a5db917876182696a8c866e /drivers | |
| parent | MAINTAINERS: Add Geert as Renesas SoC Co-Maintainer (diff) | |
| parent | powerpc/kasan: fix early boot failure on PPC32 (diff) | |
| download | linux-dev-4b6f23161b4e888e72671e377c32eabe9a8e62fc.tar.xz linux-dev-4b6f23161b4e888e72671e377c32eabe9a8e62fc.zip | |
Merge tag 'powerpc-5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
"Some more powerpc fixes for 5.3:
- Wire up the new clone3 syscall.
- A fix for the PAPR SCM nvdimm driver, to fix a crash when firmware
gives us a device that's attached to a non-online NUMA node.
- A fix for a boot failure on 32-bit with KASAN enabled.
- Three fixes for implicit fall through warnings, some of which are
errors for us due to -Werror.
Thanks to: Aneesh Kumar K.V, Christophe Leroy, Kees Cook, Santosh
Sivaraj, Stephen Rothwell"
* tag 'powerpc-5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/kasan: fix early boot failure on PPC32
drivers/macintosh/smu.c: Mark expected switch fall-through
powerpc/spe: Mark expected switch fall-throughs
powerpc/nvdimm: Pick nearby online node if the device node is not online
powerpc/kvm: Fall through switch case explicitly
powerpc: Wire up clone3 syscall
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/macintosh/smu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index 276065c888bc..23f1f41c8602 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c @@ -852,6 +852,7 @@ int smu_queue_i2c(struct smu_i2c_cmd *cmd) break; case SMU_I2C_TRANSFER_COMBINED: cmd->info.devaddr &= 0xfe; + /* fall through */ case SMU_I2C_TRANSFER_STDSUB: if (cmd->info.sublen > 3) return -EINVAL; |