diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-22 20:26:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-22 20:26:10 +0200 |
| commit | 20eabc8966f5c1973c2dd2450060f4511389a19c (patch) | |
| tree | 6f2b934a4c56f380a823d06293f4df809669a4a7 /drivers/watchdog | |
| parent | Merge tag 'tag-chrome-platform-fixes-for-v5.3-rc6' of git://git.kernel.org/pu... (diff) | |
| parent | video: fbdev: acornfb: Mark expected switch fall-through (diff) | |
| download | linux-20eabc8966f5c1973c2dd2450060f4511389a19c.tar.xz linux-20eabc8966f5c1973c2dd2450060f4511389a19c.zip | |
Merge tag 'Wimplicit-fallthrough-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux
Pull more fallthrough fixes from Gustavo A. R. Silva:
"Fix fall-through warnings on arm and mips for multiple configurations"
* tag 'Wimplicit-fallthrough-5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
video: fbdev: acornfb: Mark expected switch fall-through
scsi: libsas: sas_discover: Mark expected switch fall-through
MIPS: Octeon: Mark expected switch fall-through
power: supply: ab8500_charger: Mark expected switch fall-through
watchdog: wdt285: Mark expected switch fall-through
mtd: sa1100: Mark expected switch fall-through
drm/sun4i: tcon: Mark expected switch fall-through
drm/sun4i: sun6i_mipi_dsi: Mark expected switch fall-through
ARM: riscpc: Mark expected switch fall-through
dmaengine: fsldma: Mark expected switch fall-through
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/wdt285.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c index 4eacfb1ce1ac..eb729d704836 100644 --- a/drivers/watchdog/wdt285.c +++ b/drivers/watchdog/wdt285.c @@ -168,7 +168,7 @@ static long watchdog_ioctl(struct file *file, unsigned int cmd, soft_margin = new_margin; reload = soft_margin * (mem_fclk_21285 / 256); watchdog_ping(); - /* Fall */ + /* Fall through */ case WDIOC_GETTIMEOUT: ret = put_user(soft_margin, int_arg); break; |