summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-10-22 21:04:33 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-10-22 21:04:33 +0200
commitcacd9759eea2f1c7e8792ecd91ed4602f963b1a5 (patch)
tree59281a932bf0b3d736044eb33067cf1507ada1d7 /drivers/input/misc
parentInput: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15IGM (diff)
parentInput: synaptics - avoid using uninitialized variable when probing (diff)
downloadlinux-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.tar.xz
linux-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.zip
Merge branch 'next' into for-linus
Prepare input updates for 4.20 merge window.
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/xen-kbdfront.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
index 594f72e39639..24bc5c5d876f 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -524,7 +524,7 @@ static void xenkbd_backend_changed(struct xenbus_device *dev,
case XenbusStateClosed:
if (dev->state == XenbusStateClosed)
break;
- /* Missed the backend's CLOSING state -- fallthrough */
+ /* fall through - Missed the backend's CLOSING state */
case XenbusStateClosing:
xenbus_frontend_closed(dev);
break;