| From 08c64986605b060d826dfa7f6fbf5117accde1f0 Mon Sep 17 00:00:00 2001 |
| From: Marco Felsch <m.felsch@pengutronix.de> |
| Date: Mon, 16 Sep 2019 12:45:48 -0700 |
| Subject: [PATCH] Input: da9063 - fix capability and drop KEY_SLEEP |
| |
| commit afce285b859cea91c182015fc9858ea58c26cd0e upstream. |
| |
| Since commit f889beaaab1c ("Input: da9063 - report KEY_POWER instead of |
| KEY_SLEEP during power key-press") KEY_SLEEP isn't supported anymore. This |
| caused input device to not generate any events if "dlg,disable-key-power" |
| is set. |
| |
| Fix this by unconditionally setting KEY_POWER capability, and not |
| declaring KEY_SLEEP. |
| |
| Fixes: f889beaaab1c ("Input: da9063 - report KEY_POWER instead of KEY_SLEEP during power key-press") |
| Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/input/misc/da9063_onkey.c b/drivers/input/misc/da9063_onkey.c |
| index 9d39679372c5..4a8315261fa6 100644 |
| --- a/drivers/input/misc/da9063_onkey.c |
| +++ b/drivers/input/misc/da9063_onkey.c |
| @@ -239,10 +239,7 @@ static int da9063_onkey_probe(struct platform_device *pdev) |
| onkey->input->phys = onkey->phys; |
| onkey->input->dev.parent = &pdev->dev; |
| |
| - if (onkey->key_power) |
| - input_set_capability(onkey->input, EV_KEY, KEY_POWER); |
| - |
| - input_set_capability(onkey->input, EV_KEY, KEY_SLEEP); |
| + input_set_capability(onkey->input, EV_KEY, KEY_POWER); |
| |
| INIT_DELAYED_WORK(&onkey->work, da9063_poll_on); |
| |
| -- |
| 2.7.4 |
| |
