From patchwork Mon Jul 19 14:51:05 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: 479854 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4206298jao; Mon, 19 Jul 2021 08:01:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUiVdR5KzWBwVaqMGBUvPFaaZn3/4iVCW1kb4Bj36XwzpBwJ4eLPqTpLNG7onUm09FXXzc X-Received: by 2002:a92:d8c5:: with SMTP id l5mr17363620ilo.79.1626706878394; Mon, 19 Jul 2021 08:01:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626706878; cv=none; d=google.com; s=arc-20160816; b=tzgW8lcqOhpi6Yzy+k/pqG3LPcjJ9Tjf3XQstUEXY2K/SWqe/HJG2CrKI2fv60hoi1 xDlrCEYjfkReRBWluQtVXGwaQ2aHpAbZR5Qsy1hGPsarb8AohxR6GbBZ9vzCSioCJfCN 68cpBicNkOtPvzTjV20ADmva4T74j/EafCJB8BtZXOS5ZV6wRCfPYziRx6WxYLr44qVG 0kz0RomlazIMJA0PdOuYJNhRVoLPQDzKTiH4lDrJlr0X7WEWmrrClNRRSHAEeQZfNzf5 wmI5P0xW/nGtjXkmhj4esUO5egtpCrP/rs5JIscwUiVH+IZlgiP+PM0JL6L/Wakt8k9i H58Q== 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=BjZAOZD9/i/OjVr+vBSYn5uSs/K/DAWWx1pRlE5fgkSQcVKLCHUJCoVdZmO+ceilvM Fc4nVS28flDCI9LDk/T8T17/0a+2m2cGD59pbjlXe8BRBl7JrfLo+1KxR40UuWSq5sPJ 94i3t4W4QKodH5X53hschEySqPKMF7Ym8mAUvDe5sP1t3WP7EVETV2VXAGDUA1CXjQim SsP1eYQumWR8B8rjkLyyytsV4P4p42C2e57cA6ha/+cbbxnV2aSnlnnsXQ4OtjDwK4DI mxArh3UIxAPmSNi4b7ZdUTTi/fokTQVOY6I5FreDm+Hh/0ejPbKq9EzbEZdboPMZwkfF qLwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kYkE6XZQ; 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 o8si19257350jap.10.2021.07.19.08.01.18; Mon, 19 Jul 2021 08:01:18 -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=kYkE6XZQ; 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 S242720AbhGSOUh (ORCPT + 12 others); Mon, 19 Jul 2021 10:20:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:56408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242418AbhGSOTt (ORCPT ); Mon, 19 Jul 2021 10:19:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 42C2A6112D; Mon, 19 Jul 2021 15:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626706824; bh=nx6LgD2ukQLZyC64a/iilj1ITLGHBSab2oRGTM4Dy9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kYkE6XZQdNVRriUKgLJ4HzcA9IQLkjWnQ+UGDrWkUrQhQIeT2ktmNd1g9M2juz/EI 6IG4NzaPxIf246CckGieyclG/CXod3IKSiedKoPExK7dNF4Fo+DBjAU4CIVIoZZb39 jp3BPWcBYBHSsXTUcjPfkPycvj9ha51WIAXF7fDo= 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.4 081/188] Input: hil_kbd - fix error return code in hil_dev_connect() Date: Mon, 19 Jul 2021 16:51:05 +0200 Message-Id: <20210719144931.873310278@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144913.076563739@linuxfoundation.org> References: <20210719144913.076563739@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; }