From: Petr Štetiar Date: Tue, 4 Jun 2019 11:14:41 +0000 (+0200) Subject: gpio-button-hotplug: gpio-keys: fix always missing first event X-Git-Tag: v19.07.0-rc1~473 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6c5bfaac84b085df813cf4e620981b94fa2a77cd;p=oweals%2Fopenwrt.git gpio-button-hotplug: gpio-keys: fix always missing first event Commit afc056d7dc83 ("gpio-button-hotplug: support interrupt properties") changed the gpio-keys interrupt handling logic in a way, that it always misses first event, which causes issues with rc.button scripts, so this patch restores the previous behaviour. Fixes: afc056d7dc83 ("gpio-button-hotplug: support interrupt properties") Reported-by: Kristian Evensen Tested-by: Kuan-Yi Li Signed-off-by: Petr Štetiar Signed-off-by: Christian Lamparter [drop state check] --- 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 f429f8c027..daa4b2a4f7 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -340,16 +340,9 @@ static void gpio_keys_irq_work_func(struct work_struct *work) { struct gpio_keys_button_data *bdata = container_of(work, struct gpio_keys_button_data, work.work); - int state = gpio_button_get_value(bdata); - if (state != bdata->last_state) { - unsigned int type = bdata->b->type ?: EV_KEY; - - if (bdata->last_state != -1 || type == EV_SW) - button_hotplug_event(bdata, type, state); - - bdata->last_state = state; - } + button_hotplug_event(bdata, bdata->b->type ?: EV_KEY, + gpio_button_get_value(bdata)); } static irqreturn_t button_handle_irq(int irq, void *_bdata)