From: Felix Fietkau Date: Sat, 29 Jun 2013 19:01:49 +0000 (+0000) Subject: gpio-button-hotplug: improve gpio button debouncing, verify state changes over multip... X-Git-Tag: reboot~10095 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0f6e9c9fcc18fee284f3e4a1201c5a257d83b1b1;p=openwrt%2Fstaging%2Fpepe2k.git gpio-button-hotplug: improve gpio button debouncing, verify state changes over multiple polls. fixes spurious failsafe triggers (#13784) Signed-off-by: Felix Fietkau SVN-Revision: 37090 --- diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index 9d91b57b56..412c045fe4 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -274,10 +274,16 @@ static void gpio_keys_polled_check_state(struct gpio_keys_button *button, if (state != bdata->last_state) { unsigned int type = button->type ?: EV_KEY; + if (bdata->count < bdata->threshold) { + bdata->count++; + return; + } + button_hotplug_event(bdata, type, button->code, state); - bdata->count = 0; bdata->last_state = state; } + + bdata->count = 0; } static void gpio_keys_polled_queue_work(struct gpio_keys_polled_dev *bdev) @@ -299,11 +305,7 @@ static void gpio_keys_polled_poll(struct work_struct *work) for (i = 0; i < bdev->pdata->nbuttons; i++) { struct gpio_keys_button_data *bdata = &bdev->data[i]; - - if (bdata->count < bdata->threshold) - bdata->count++; - else - gpio_keys_polled_check_state(&pdata->buttons[i], bdata); + gpio_keys_polled_check_state(&pdata->buttons[i], bdata); } gpio_keys_polled_queue_work(bdev); }