Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2255287ybg; Sun, 27 Oct 2019 14:30:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqz9LewIl2zYLQnZ1QacLsmXtwtNV3DH87TFPEnPhPaLR0szV8XmgcZUslDXHttrxuP0qsVL X-Received: by 2002:aa7:c954:: with SMTP id h20mr16044566edt.159.1572211827599; Sun, 27 Oct 2019 14:30:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211827; cv=none; d=google.com; s=arc-20160816; b=Ea8kVZAmH/65GWbAkfi8BXnX010KlEHV1vtmDwjuYR9RqU16aKV8f8uKBqFHmgCFUQ dqr3NgVcRv6pXC1ql2+Y+KNu/hFp06NuKHZroGDfr0cFq4BkTi91yxIwn4OyQRZkvIJ/ h9h9Vfl0EmmPIUBOoR+3Qx3BjPJjpnfh8UlTptr32KOJ8Oo9rEIm5Z0SWgiobvEiDbbY WKZaMUqaB8rRJIPlKUKPmyeODv7QSPvThjeqoqz+FzvSmsV0JNcqNk2fvMuzcTYEoOY0 1LATHr2mI34faakkDhz7jn742GesdofpouItptOEZLYCvr219jB8at7QZMge96kqXzAW avWA== 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=GGVsoyMVNJLK2bYH7njFOp8RL34MIRl8Q4kGhYuXJRw=; b=U45iOQlEdqY0MfKRN54BSctAMM2CiZ3SUXOuIP8I0pR4Emw3FWdbsgmJdB/VQjLttl iKGPOLQbf9VL9cbQhEQ2UnXlb1wGOvXSsP84Hno4rsOkPpSQ0Na4Wl6mCXjoOFy39HJa HPk1X0V+zRi4q9tDjK2ycaK1KA79pMVRoLsfI++d0LPl0Z5AsA1Zkc06BpembSNPEtei AoOuHvEaoH2uLwiWmRTvgVL0fuIVtD/2TRtO3p3wJyRP+xJe69lSbFQbU2B2CnVaR/Bh +ie6G5nD7emqRmwGG9j+3JDyoa2mGdDVbW7I+WTRGpD7un19drV/kVhU8zwCgMMy1iPA wh3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gMagE3kD; 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 a12si4819520ejp.425.2019.10.27.14.30.04; Sun, 27 Oct 2019 14:30:27 -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=gMagE3kD; 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 S1732118AbfJ0VWV (ORCPT + 99 others); Sun, 27 Oct 2019 17:22:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:43328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732094AbfJ0VWT (ORCPT ); Sun, 27 Oct 2019 17:22:19 -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 5CEDD21726; Sun, 27 Oct 2019 21:22:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211337; bh=bjdEh2/bcBbBN8i1npeg2F+1dvD2NTMkfR4pHea/yaY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gMagE3kD472ySFDz8fmQ2xOpvWpNTcmoH9IsP6+U6oBE80ewgUA9Q+pfHFFXrYFSQ JYVyvH7qa3SNmylBIuebuKwNM3zRpCcasUqhKp5oFcYGEqYp/AJlwCZ2qUXfYdEJrj 0Sn5wPJTeT8/ZJRXcq23UdLFB9NcT5qLDXqy5Afg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marco Felsch , Dmitry Torokhov Subject: [PATCH 5.3 115/197] Input: da9063 - fix capability and drop KEY_SLEEP Date: Sun, 27 Oct 2019 22:00:33 +0100 Message-Id: <20191027203357.950190046@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@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 @@ -232,10 +232,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);