From patchwork Mon Jul 19 14:50:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479878 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4218057jao; Mon, 19 Jul 2021 08:12:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx16vCchsRKpBSKrOnevlJhiOaIQoLirbZnmR0ap9/QTNuowREEz9pemWiF5ryYj0O5m78d X-Received: by 2002:a19:4907:: with SMTP id w7mr18441981lfa.136.1626707558173; Mon, 19 Jul 2021 08:12:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707558; cv=none; d=google.com; s=arc-20160816; b=VNJno4EvZm+7nsvWZ2V0wCj/sJcjG23DtS3OkTbFxPO2agpWdgArczEU+D5aNt+nGC ookqVk3Xh33Ewl1qznd263/Ts9e1wUj3PStaWiVlyYRqYEWWG2Uj0atQQ51VxBBuESyq WiXcQ+dgNIgFLc+JiC3fjoVEIQXNztuqEJtxubpLr9eAeJZ78Pk0P3GoSwcfAoZHoXWV sYatuL1Myjbnx8mfyhvwJDZi7rcS8UEIrrmGQI3pYKOwMVtekl3CQDLu9KXVZmXhozxO hy+dMAUp9akptf7olYViVSu6Qz7Q0E5vO+JUnGWdKSaSw23rx2gYFzBb015zzVwNVDaa SapA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9RbYxfkvSezy0PSW362wXe6mVTaf9cCqIRlQrpXPJRw=; b=cfYQH7nYSGF9JU8Lc++xJYv18ECdIzHzGFLKUKnwzYF22vI6KDEhXCRo41VJj/4jMO oh5nJHv2T2PIKpUrumKjwsQVW7fPVzwexfMCaqldEKPPlLd7KlCcfnx0ADDMHOiL/Wfa aKnTNMTIU6brsMAMOeouc3IMSGy5JrQrHbCPwLqLaDd0AcsASnfQowah7a0SmGtMq9qX oX9lujaL5Ute437kZl+gbDpYROLnniOxnVzba1Sa0NXig5Xx6O9K9mQMTwpmbIMNf2/u vYX3knfcJWrTfjYTgAhisyHIumJigaHjXeBY3lVfFUp0cV26vKjkUMecFqO40KugCIpC UvXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jBhr0uro; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d26si20449114ejc.620.2021.07.19.08.12.37; Mon, 19 Jul 2021 08:12:38 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jBhr0uro; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245268AbhGSObg (ORCPT + 12 others); Mon, 19 Jul 2021 10:31:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:38874 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244467AbhGSO3q (ORCPT ); Mon, 19 Jul 2021 10:29:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B5ED761205; Mon, 19 Jul 2021 15:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707380; bh=nx6LgD2ukQLZyC64a/iilj1ITLGHBSab2oRGTM4Dy9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jBhr0uroqoKISpRgL5AZbwcs1uAJwZi1PeIXPgdFD2Ab4FjZ6TkXrPTilbe4rKM4t Q3hlQH1ZQiXJXZccMaNw0uO9o1CAACIzOvyff53Oc8QnGthQ3g+jRUv31yUoaZoNnT Pntw00v/Kz1aCViBxWSFvoEQWfiiBpo9bAy1jpOY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Dmitry Torokhov , Sasha Levin Subject: [PATCH 4.9 106/245] Input: hil_kbd - fix error return code in hil_dev_connect() Date: Mon, 19 Jul 2021 16:50:48 +0200 Message-Id: <20210719144943.850853609@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.288257948@linuxfoundation.org> References: <20210719144940.288257948@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit d9b576917a1d0efa293801a264150a1b37691617 ] Return error code -EINVAL rather than '0' when the combo devices are not supported. Fixes: fa71c605c2bb ("Input: combine hil_kbd and hil_ptr drivers") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210515030053.6824-1-thunder.leizhen@huawei.com Signed-off-by: Dmitry Torokhov Signed-off-by: Sasha Levin --- drivers/input/keyboard/hil_kbd.c | 1 + 1 file changed, 1 insertion(+) -- 2.30.2 diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c index 5b152f25a8e1..da07742fd9a4 100644 --- a/drivers/input/keyboard/hil_kbd.c +++ b/drivers/input/keyboard/hil_kbd.c @@ -512,6 +512,7 @@ static int hil_dev_connect(struct serio *serio, struct serio_driver *drv) HIL_IDD_NUM_AXES_PER_SET(*idd)) { printk(KERN_INFO PREFIX "combo devices are not supported.\n"); + error = -EINVAL; goto bail1; }