From patchwork Mon Oct 30 17:40:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 10032963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3FEE660291 for ; Mon, 30 Oct 2017 17:41:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EEFE28901 for ; Mon, 30 Oct 2017 17:41:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23CDC28915; Mon, 30 Oct 2017 17:41:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB1A828901 for ; Mon, 30 Oct 2017 17:41:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932673AbdJ3RlA (ORCPT ); Mon, 30 Oct 2017 13:41:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60106 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932723AbdJ3Rk7 (ORCPT ); Mon, 30 Oct 2017 13:40:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 05DA2C0567B3; Mon, 30 Oct 2017 17:40:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 05DA2C0567B3 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=hdegoede@redhat.com Received: from shalem.localdomain.com (ovpn-116-133.ams2.redhat.com [10.36.116.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FCEF600C9; Mon, 30 Oct 2017 17:40:57 +0000 (UTC) From: Hans de Goede To: Dmitry Torokhov , Benjamin Tissoires Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH v3 4/4] Input: soc_button_array - Suppress power button presses during suspend Date: Mon, 30 Oct 2017 18:40:50 +0100 Message-Id: <20171030174050.30375-4-hdegoede@redhat.com> In-Reply-To: <20171030174050.30375-1-hdegoede@redhat.com> References: <20171030174050.30375-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 30 Oct 2017 17:40:59 +0000 (UTC) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the power-button is pressed to wakeup the laptop/tablet from suspend and we report a KEY_POWER event to userspace when woken up this will cause userspace to immediately suspend the system again which is undesirable. This commit sets the new suppress_evdev_events_on_wakeup flag in the gpio_keys_button struct for the power-button suppressing the undesirable KEY_POWER input events on wake-up. Signed-off-by: Hans de Goede --- Changes in v3: -Adjust for the renaming of the flag to suppress_evdev_events_on_wakeup -Explicitly init the flag for all members of the soc_button_PNP0C40 array --- drivers/input/misc/soc_button_array.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index 23520df7650f..39f06979961f 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -27,6 +27,7 @@ struct soc_button_info { unsigned int event_code; bool autorepeat; bool wakeup; + bool suppress_evdev_events_on_wakeup; }; /* @@ -100,6 +101,8 @@ soc_button_device_create(struct platform_device *pdev, gpio_keys[n_buttons].active_low = 1; gpio_keys[n_buttons].desc = info->name; gpio_keys[n_buttons].wakeup = info->wakeup; + gpio_keys[n_buttons].suppress_evdev_events_on_wakeup = + info->suppress_evdev_events_on_wakeup; /* These devices often use cheap buttons, use 50 ms debounce */ gpio_keys[n_buttons].debounce_interval = 50; n_buttons++; @@ -185,6 +188,7 @@ static int soc_button_parse_btn_desc(struct device *dev, info->name = "power"; info->event_code = KEY_POWER; info->wakeup = true; + info->suppress_evdev_events_on_wakeup = true; } else if (upage == 0x07 && usage == 0xe3) { info->name = "home"; info->event_code = KEY_LEFTMETA; @@ -369,11 +373,11 @@ static int soc_button_probe(struct platform_device *pdev) * Platforms" */ static struct soc_button_info soc_button_PNP0C40[] = { - { "power", 0, EV_KEY, KEY_POWER, false, true }, - { "home", 1, EV_KEY, KEY_LEFTMETA, false, true }, - { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false }, - { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false }, - { "rotation_lock", 4, EV_SW, SW_ROTATE_LOCK, false, false }, + { "power", 0, EV_KEY, KEY_POWER, false, true, true }, + { "home", 1, EV_KEY, KEY_LEFTMETA, false, true, false }, + { "volume_up", 2, EV_KEY, KEY_VOLUMEUP, true, false, false }, + { "volume_down", 3, EV_KEY, KEY_VOLUMEDOWN, true, false, false }, + { "rotation_lock", 4, EV_SW, SW_ROTATE_LOCK, false, false, false }, { } };