From patchwork Mon Jul 12 06:11:10 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: 472879 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2649313jao; Sun, 11 Jul 2021 23:32:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxjUxT4VRo5otvICBRSssoQZduqiTcgwdA/pqlvbHBm0s7zhs+Gvx8Zj4ZgndH9+DTln3o X-Received: by 2002:a05:6402:458:: with SMTP id p24mr62183393edw.142.1626071438026; Sun, 11 Jul 2021 23:30:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626071438; cv=none; d=google.com; s=arc-20160816; b=YGFQ5xJ8wERmUN1M+4MzUwKXE0L4Zy782YAt+gRDGhYV1dQzqWFutKyuPZRKs5kuiS ocACfgR3hca5b7pRyk1obvDm7HROt5Cwgz67mpk2CekVYq6LTTFHmvI5iYto5hfDJH1u KHRZHbCTbIglnlqFIGuNYFy92e22WNjcsVogNlQj8gLsNWUdVRMZDGgJ7tnMggHwxy3o m66QaA9TVmsNDekc1YnLkuevLANwAJmYKvNiu+LN5v0FePDK75XIlDj+wZo3iWySXDFO fcTyB42kIyhOAr9VeYhBFL4FXIA3Y4eC7n6Twuj6Qx9AU0xqjtSjtiqdQ3NTdlqTNRk4 W9BQ== 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=0F0XBNXWnE912dJYrUzBIXLJIwMzmMEkkzY6AIn0foxlBES8fdOS7JdelSlgir7xAg Le2clcpYbKRaKIM4IAALgKCpbfcDK0cBfi21YmiOsjj99hcu79bR94YNo+Zj3C9VAXz1 l80W74Z1Sa/vqUKl6+5RltCa6zYjxPkxRgQNaOWxg9XX2PDqTi6RPKHWSomsxAdzbTRO uTIdT6x8jSQ5BXy5Qgqcx2lpXCEfeez+8XiWyL0p59NoRkqcfLbDSMx/zDRiADMQzJgb DizQp6JkH47JI/NeBMHBzJvqziLuxbo5uygWsiZSoVY89+xQFabSY/7luUM4ov0W3bg9 mRZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=S5mCOYX9; 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 t15si9130924ejd.275.2021.07.11.23.30.37; Sun, 11 Jul 2021 23:30: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=S5mCOYX9; 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 S235779AbhGLGdX (ORCPT + 12 others); Mon, 12 Jul 2021 02:33:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:48074 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235691AbhGLG32 (ORCPT ); Mon, 12 Jul 2021 02:29:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B3E2611F1; Mon, 12 Jul 2021 06:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626071130; bh=rQGy8cqcvQFQWXICBxVU7vxBghpZ8ulbRgzAOF6P3BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S5mCOYX9Pl1Y2My25LLaNhzhQqMgWVN3Jbr/6dhs7Atq10WuYjRQDJWqc9g8o34RS L62DCu4JonKuttOlULoAe9e+Atae0lbFzue60/b2rUKqJfrQYXBteWebxx7oGi06vC hSBzypTvOgpp9MSaPaM5Eh7NrhPkY7GfyZnQWXHM= 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.4 286/348] Input: hil_kbd - fix error return code in hil_dev_connect() Date: Mon, 12 Jul 2021 08:11:10 +0200 Message-Id: <20210712060741.597578837@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060659.886176320@linuxfoundation.org> References: <20210712060659.886176320@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; }