Commit 77fa0554 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Dmitry Torokhov

Input: gpio_keys - don't report events on gpio failure

In the cases where the gpio chip fails to acquire the current state an
error is reported back to gpio_keys. This is currently interpreted as if
the line went high, which just confuses the developer.

This patch introduces an error print in this case and skipps the
reporting of a input event; to aid in debugging this issue.
Reported-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent a27b5e0a
...@@ -341,8 +341,14 @@ static void gpio_keys_gpio_report_event(struct gpio_button_data *bdata) ...@@ -341,8 +341,14 @@ static void gpio_keys_gpio_report_event(struct gpio_button_data *bdata)
const struct gpio_keys_button *button = bdata->button; const struct gpio_keys_button *button = bdata->button;
struct input_dev *input = bdata->input; struct input_dev *input = bdata->input;
unsigned int type = button->type ?: EV_KEY; unsigned int type = button->type ?: EV_KEY;
int state = (gpio_get_value_cansleep(button->gpio) ? 1 : 0) ^ button->active_low; int state = gpio_get_value_cansleep(button->gpio);
if (state < 0) {
dev_err(input->dev.parent, "failed to get gpio state\n");
return;
}
state = (state ? 1 : 0) ^ button->active_low;
if (type == EV_ABS) { if (type == EV_ABS) {
if (state) if (state)
input_event(input, type, button->code, button->value); input_event(input, type, button->code, button->value);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment