From patchwork Mon Jul 12 06:10:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472912 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2661573jao; Sun, 11 Jul 2021 23:51:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLWBZVRIpiO0D5FxVzYAfaX+nMsUz2mk3ATFB5tKevMlRLN39BZp1RfernadhiS8dohXif X-Received: by 2002:a17:906:1b41:: with SMTP id p1mr30879692ejg.486.1626072628925; Sun, 11 Jul 2021 23:50:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072628; cv=none; d=google.com; s=arc-20160816; b=03u8iQhkJ6/FyulybHY91Sf0ulidTKU4PibdWwwniI00ZCALrLfx++5iH8YVGRCZYp 5P61lRnrP7lqeuTh2y8FzsSlm/4GICYqU3q+LesWedZQP23UemJc2Cu002KkA2vAUvvG FieYzKJ0iP+8DoQ56ufRTBOPddvqiBWiHyIJLwfIBXGouiyWrdfHt6oNopCQjWzLtAze naD1MMzytpUOVkgEkrbunDmSmPG15csqAl5jUDtHdW4X1NOZT/qwfHz4NRcfRlIB4n2K +r5geSgk73jFeLAgzCa5+T3V2HsiKXM38Ulw1f9XErEme+aMGrd3uMpFVUEixZI6kBp5 wBfg== 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=LB3DmgeCbFGC37Lezp6m9DAtWYO5wAR0xf6DFFge8V9VwGl9zZ45txdH1mJMY2a1df DiaUe66bNtyKWcqYWbEaYBlL6SuWCDdahM0oLeG5xQ2WhRa6OTpqP3SDK85M4r0dDgTf ojY5kwxz+38GEM4iPV/4lwztrxP16Z1OpgVV1afxe/mon6mdTBilN2soActQk8Wnjtt7 52xNdJbVwK0nklWUPc8fKdo2F7K/Huw6ROCkkg3bDFYGeGNeCB7yh4olFq5mIHgzGNmt R6Y6VDpozp9mYzSRgSe4NtynK8M8bIYNae7aofgLsb9/filFUUlzOF91nIXwLJiE62tj yQPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ek29nBaQ; 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 r25si3440466edp.437.2021.07.11.23.50.28; Sun, 11 Jul 2021 23:50:28 -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=Ek29nBaQ; 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 S239187AbhGLGwj (ORCPT + 12 others); Mon, 12 Jul 2021 02:52:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:48256 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239190AbhGLGta (ORCPT ); Mon, 12 Jul 2021 02:49:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1FEAB60241; Mon, 12 Jul 2021 06:46:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072380; bh=rQGy8cqcvQFQWXICBxVU7vxBghpZ8ulbRgzAOF6P3BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ek29nBaQXUGrJ3/kujW1AqehmwOI7Y5NDgZNZTpif1i75F1mGJREl6E0x1dIp+rLL BDb2EA6jl4kA9kf0KRfyM9gEm8PW+zXjc+PnTXo7f/glk8U9VEPGJoGxgpn6Dn6lj1 oapJBA4lf2Ypbojhy5A22gwjhOB5qbWEIhkUi/rU= 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.10 471/593] Input: hil_kbd - fix error return code in hil_dev_connect() Date: Mon, 12 Jul 2021 08:10:31 +0200 Message-Id: <20210712060941.845440927@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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; }