diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-03-03 23:14:44 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-03-03 23:14:44 -0800 |
| commit | 65e91e2845b5b8965f21a856e1e0ad70c6522ce7 (patch) | |
| tree | 61b1c7e22270297690f02e0c169e917a27304aef /drivers/input/joystick | |
| parent | 7ad222b3aed350adfc27ee7eec4587ffe55dfdce (diff) | |
| parent | 44466306ebecc73c68835f5fe27d119591a1ab5c (diff) | |
| download | linux-next-65e91e2845b5b8965f21a856e1e0ad70c6522ce7.tar.gz | |
Merge branch 'next' into for-linus
Prepare input updates for 5.1 merge window.
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/db9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index 804b1b80a8be..5a52b65bef9a 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c @@ -259,7 +259,7 @@ static unsigned char db9_saturn_read_packet(struct parport *port, unsigned char db9_saturn_write_sub(port, type, 3, powered, 0); return data[0] = 0xe3; } - /* else: fall through */ + /* fall through */ default: return data[0]; } |