From patchwork Mon Jul 12 06:10:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 472988 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2684139jao; Mon, 12 Jul 2021 00:25:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypuh4UBdFQ490PRRFaGNfTKn5rjWXEoRQxJ/qoCAT8SjikWhcksZRrUXXAa/+VTX9MUDL3 X-Received: by 2002:a05:6402:1057:: with SMTP id e23mr64745890edu.352.1626074603810; Mon, 12 Jul 2021 00:23:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626074603; cv=none; d=google.com; s=arc-20160816; b=cQSRoonP/qEsD/CR/FqJa6J2JVz25nxf6rsTrPiuMdS1sHoGRMTK+bcAdlxhV0L6BS yIN7DJ1BpMK6NRegS2TSEW1WlC6Rx2K9WBsJGMQR4xf3RBHEgB9qedEKKDkNr3Q0klii fDcIw/LlqEAjFQN4KssTFGJx4Y9bT2DjcH8b8cXOHdEuy2mqVps1aJkBWpq6KOwri8oU L2+vVB65Y4uTlQx6HJSQeeUZUU3xk/Ap3bYYTsnX5n76C37OyWJgjDn6KdDZuAiJF235 WVm3SpythpWIdT2vekm+xB50cCr6WmYT5zaX8mw347Q+Ka8lRsJ3aJeGK9hw1Grd8PKu NQKA== 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=ZwPPrC1lMmOs0hHVAzSPgNjz6wHpnVVGGnHbO1lmFZo=; b=S0QzLvn04C8x9+8dnFRv9B9lV2BA2At6BFAg/9i0PIOCRTX2AdLWggaqR+91nmJOo6 la6pTALHlsImccnllRbVFNKrMeMgmSlK+CSRhwFgsba4gS4USdfeE9nbxqMspOQA8dY6 o6CGYxxkAsfRNWBJ1r4jyDJmjymadx1lxq8wokqQpvyodqbDlpMU0GA2vh9HuBCx11a8 DInr6mjVFIpnwdid45l2qS3S4DdMWCJy7INVNuwZyN3UzImkmpLZtKebyJ4HS5EUjFC+ nYzzHL39inGKt/E5VhvIenVsGds4+kesSismOiqapxeVw7RL9EJgewn7e3oTpMjSi5YC i2CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eKYy5wvP; 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 d9si16909677edq.169.2021.07.12.00.23.23; Mon, 12 Jul 2021 00:23:23 -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=eKYy5wvP; 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 S243009AbhGLHXr (ORCPT + 12 others); Mon, 12 Jul 2021 03:23:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:33068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242566AbhGLHWZ (ORCPT ); Mon, 12 Jul 2021 03:22:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D722D61004; Mon, 12 Jul 2021 07:19:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626074375; bh=rQGy8cqcvQFQWXICBxVU7vxBghpZ8ulbRgzAOF6P3BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eKYy5wvPpnQGgBVUbVzpfToKo6c0O3vxtdaQLv0VsUwJrpJ+QFJnXr38I/E3rJgUn XkmExFiNbcfRZtF5eXaCUCPLD3mFIe3/Zqtmz5WlNTiPs/O12DEjS/oQsr7Zn01dAD saSX7fBc5e/i+r204MFpEiSgL1Z7unWBok3Bwxjo= 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 5.12 559/700] Input: hil_kbd - fix error return code in hil_dev_connect() Date: Mon, 12 Jul 2021 08:10:42 +0200 Message-Id: <20210712061035.685792078@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@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 bb29a7c9a1c0..54afb38601b9 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; }