diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-10-22 12:04:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-10-22 12:04:33 -0700 |
| commit | cacd9759eea2f1c7e8792ecd91ed4602f963b1a5 (patch) | |
| tree | 59281a932bf0b3d736044eb33067cf1507ada1d7 /drivers/input/mouse | |
| parent | Input: elan_i2c - add ACPI ID for Lenovo IdeaPad 330-15IGM (diff) | |
| parent | Input: synaptics - avoid using uninitialized variable when probing (diff) | |
| download | linux-dev-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.tar.xz linux-dev-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.20 merge window.
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/cyapa_gen3.c | 4 | ||||
| -rw-r--r-- | drivers/input/mouse/synaptics.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/input/mouse/cyapa_gen3.c b/drivers/input/mouse/cyapa_gen3.c index 076dda4a66da..00e395dfc3d5 100644 --- a/drivers/input/mouse/cyapa_gen3.c +++ b/drivers/input/mouse/cyapa_gen3.c @@ -1067,7 +1067,7 @@ static int cyapa_gen3_do_operational_check(struct cyapa *cyapa) return error; } - /* Fallthrough state */ + /* Fall through */ case CYAPA_STATE_BL_IDLE: /* Try to get firmware version in bootloader mode. */ cyapa_gen3_bl_query_data(cyapa); @@ -1078,7 +1078,7 @@ static int cyapa_gen3_do_operational_check(struct cyapa *cyapa) return error; } - /* Fallthrough state */ + /* Fall through */ case CYAPA_STATE_OP: /* * Reading query data before going back to the full mode diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 55d33500d55e..5e85f3cca867 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -99,9 +99,7 @@ static int synaptics_mode_cmd(struct psmouse *psmouse, u8 mode) int synaptics_detect(struct psmouse *psmouse, bool set_properties) { struct ps2dev *ps2dev = &psmouse->ps2dev; - u8 param[4]; - - param[0] = 0; + u8 param[4] = { 0 }; ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES); ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES); |