From patchwork Mon Jul 12 06:11:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473049 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2714203jao; Mon, 12 Jul 2021 01:11:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcfjke/9/37/Xzr8xOhrlFhmoksCDqk6BoiIwvDxkZBdb62zibv/sAwI7RB/ra1obOBq8R X-Received: by 2002:a17:906:1da1:: with SMTP id u1mr50646119ejh.307.1626077488589; Mon, 12 Jul 2021 01:11:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077488; cv=none; d=google.com; s=arc-20160816; b=qodDzgE0Tk9AnsjDOU1xFLNFbRXtHx3LVqcCKLnK5f/GoEFru2aTu8REz93y4GORbT CJA13pBaxjcRfj9IbypFtUevuVVCoKjnOgKs4bPQTe0vkN0SXcTPp28EssxdCegaZpi5 YKfNs2j7hYeZeKLEWJuObgiKHUuy0sOw62yi0qQzJIxtIOgPX/M0dUAaLD3tbqQ56Ij9 lbwl+QRncOTyGmiu3mxJWN2puHqRRo20dr+lzsuK1Nrx7yKOjdLwtrZbIPZgRp9VgbG6 Iag3pOksU/wAUNv7BSqgMjAuMHGo5jaYukXVRq8RgamJern8DSTaM9OTyfQ7AczK7hHz UkyA== 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=GZv38pC8ylz+TfUi8Gk5xQajOwFMLErXPIxOUOa27DoL+NldmlQGSoHMkMGaynNZ4+ 4GRnCm0FA4X3ZlC4xMZZODWQ9IsCSLdUxpf898o+qLFxSeP+KWKXljOm03ho4pBVE0Ve qNOY8cFzs/B++X07cqnNTxPOsAHcdfi1GFj01iaIO2G4WS+wb56zAuTVSkyv+ZbyA/7o AlEKd17ggWdlnbn/N1WJ1r3dglPSwxwukFmZkoL46oOJ5a+WyRPiRv7A2SenrVvvAyPi NZQ+GRSW+vn10VcyVmqMXjGVnREsolOGViJHPivm2SaxVsIWacUZAET1IZk/DoP2qQm8 oa/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=egoyarNX; 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 n21si13642925eda.13.2021.07.12.01.11.28; Mon, 12 Jul 2021 01:11: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=egoyarNX; 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 S1355370AbhGLIJe (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:54816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353046AbhGLIBA (ORCPT ); Mon, 12 Jul 2021 04:01:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BF11061981; Mon, 12 Jul 2021 07:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076440; bh=rQGy8cqcvQFQWXICBxVU7vxBghpZ8ulbRgzAOF6P3BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=egoyarNX+u0ZEW7XUh+wz+m5D3hPneDW4IKqJyhi/0jUArbGTOVpZdgNQQ2u2/0eI hxZnAorSeHWfXzhaSKg8yjrQ5WADI/zrCGFEwBzglI9uMXw+H8Mr8VxfIqqJ/J/h4a LT4Av8S2XDpQsSzrWXxoor1pwtd+ZAh1bAwo37fM= 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.13 643/800] Input: hil_kbd - fix error return code in hil_dev_connect() Date: Mon, 12 Jul 2021 08:11:06 +0200 Message-Id: <20210712061035.477639622@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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; }