diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-29 02:10:54 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-29 02:10:54 +0100 |
| commit | 592b15ba7260f8dec8bfc71ef0ea1934801a35aa (patch) | |
| tree | 51ead1b83e10da0cf6623116f37a15bc142f9d8b /drivers/input/misc | |
| parent | Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G (diff) | |
| parent | Input: atmel_mxt_ts - don't try to free unallocated kernel memory (diff) | |
| download | linux-592b15ba7260f8dec8bfc71ef0ea1934801a35aa.tar.xz linux-592b15ba7260f8dec8bfc71ef0ea1934801a35aa.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.21 merge window.
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/drv2667.c | 6 | ||||
| -rw-r--r-- | drivers/input/misc/rotary_encoder.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/input/misc/drv2667.c b/drivers/input/misc/drv2667.c index 2849bb6906a8..6091f0490e8f 100644 --- a/drivers/input/misc/drv2667.c +++ b/drivers/input/misc/drv2667.c @@ -177,9 +177,9 @@ static int drv2667_set_waveform_freq(struct drv2667_data *haptics) error = regmap_write(haptics->regmap, DRV2667_PAGE, read_buf); if (error) { dev_err(&haptics->client->dev, - "Failed to set the page: %d\n", error); - return -EIO; - } + "Failed to set the page: %d\n", error); + return -EIO; + } } return error; diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c index 1588aecafff7..72eee6d55527 100644 --- a/drivers/input/misc/rotary_encoder.c +++ b/drivers/input/misc/rotary_encoder.c @@ -240,8 +240,10 @@ static int rotary_encoder_probe(struct platform_device *pdev) encoder->gpios = devm_gpiod_get_array(dev, NULL, GPIOD_IN); if (IS_ERR(encoder->gpios)) { - dev_err(dev, "unable to get gpios\n"); - return PTR_ERR(encoder->gpios); + err = PTR_ERR(encoder->gpios); + if (err != -EPROBE_DEFER) + dev_err(dev, "unable to get gpios: %d\n", err); + return err; } if (encoder->gpios->ndescs < 2) { dev_err(dev, "not enough gpios found\n"); |