Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2240294ybg; Sun, 27 Oct 2019 14:09:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqwqTQooZjDapBPsKkPeHavV8M87mtOYeHaofmUQivkR+5UAE2ZqL3/BcxO6efqVEk91Dx7B X-Received: by 2002:a50:b966:: with SMTP id m93mr15818326ede.228.1572210598913; Sun, 27 Oct 2019 14:09:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572210598; cv=none; d=google.com; s=arc-20160816; b=lmC/j+xyEYfeQjTHP06vbEfV0eY7UM4BC7MXrl3L38U8smlReNB0rgd0hYBdBRk7BD T5JyQKNT1MDfValqi7i1xKhjApzXh4bP7fmp85naAU0RBp+rLnC9SPaRneqXXl2FqhOH ZGxx2VcWeOoK1u7Vw1x5DIA0GEwLbw3G1KoX7XQA+y4cXu9H0cea8l918nZk/4UR3vvp zoI4bzhhPpX8/3638FKIW+z+s9i/mub4SbiGouU2X3fIoWNv6vk8j1EUbOSV5e6Zrnmk vrg9cbvMP/9b2py9/HHJv/dRF5PZcB2IzxLVOcJkKkvk7XbymujQf3N6YQMCRehHRSm1 Di5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SOvV3SVswL3o7AUecck7koli9a8HWuSYu3q3c5MlOG4=; b=vrjOjWvNXmchUYFm9Ir4ujQc7tCA0W3KcJ45xDua8AbqtixAvLuHeW3Ogqvb1l2T+A Rk4D3z4n8f61Q2DnsfT+8e4UOp9EYyJWsm6RJ4bUmNvOwMSniH7cm7ftdTcKMkNZ8Vw/ 8W7AIu0T0XIimqAzspLXDIGdvs0CCSVbnTFUoxqYpanxOUks6UlOYMUExMIAcokWZvZZ aZijVP197nOeqiu1JfdxMdHySUkdWsl7SEcz4Y7yhlMRl2+/+XlBQVsHIPadV70Dljfn uvDjdxO4DRvyq/g4ASNxXLTmyp8F2EFlW6ppkgmwme6lr2LeQAcTO6tNM7i8wY1CjfIV oFXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JzptqsSo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q24si4779779ejr.128.2019.10.27.14.09.34; Sun, 27 Oct 2019 14:09:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JzptqsSo; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727261AbfJ0VGJ (ORCPT + 99 others); Sun, 27 Oct 2019 17:06:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:52008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727935AbfJ0VGG (ORCPT ); Sun, 27 Oct 2019 17:06:06 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 74A35214AF; Sun, 27 Oct 2019 21:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572210366; bh=xfn2grFNQHAMa2mnB8e9OG/12JI0L+LK0zEft7BaaBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JzptqsSoBpYRE060pMbIIK84iwpMHNI5ycxPwEx2BuPuM7MI7lYsDe4tIM/S5i3q1 qghbS+VI/g9+KTFOfhfxw/gdfApUxUKKtCbkKIbhEil2tOURgLUzOQcYG3utEIuQIX GPz2uTmY8AsplO5aqyuvhRBttDQfcxomtO4E50nk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marco Felsch , Dmitry Torokhov Subject: [PATCH 4.9 33/49] Input: da9063 - fix capability and drop KEY_SLEEP Date: Sun, 27 Oct 2019 22:01:11 +0100 Message-Id: <20191027203147.681498332@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203119.468466356@linuxfoundation.org> References: <20191027203119.468466356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marco Felsch 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 Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/misc/da9063_onkey.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/drivers/input/misc/da9063_onkey.c +++ b/drivers/input/misc/da9063_onkey.c @@ -247,10 +247,7 @@ static int da9063_onkey_probe(struct pla 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);