diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-08-19 12:43:13 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-08-19 12:43:13 +1000 |
| commit | 4215fa2d7d3a872c4f6f383dc52961215b0ce2d6 (patch) | |
| tree | 3a91c7bbf90d168ad945705292cc735838139651 /drivers | |
| parent | 2b87a2553aa04105724d6c844e223415985246ed (diff) | |
| parent | b9ee5e04fd77898208c51b1395fa0b5e8536f9b6 (diff) | |
Merge branch 'fixes' into next
Merge in our fixes branch, which brings in clone3() as well as some
implicit fallthrough fixes we want in next.
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; |