From patchwork Mon Jul 19 14:49:58 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: 479953 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4243343jao; Mon, 19 Jul 2021 08:41:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzLcOmHq8W/JcidOb8ILsRKKnzm9brATxoeyMJumy/S703aqe0dtJVImB1xOQWo5UfFk7tr X-Received: by 2002:a92:cf0a:: with SMTP id c10mr11605269ilo.19.1626709300915; Mon, 19 Jul 2021 08:41:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709300; cv=none; d=google.com; s=arc-20160816; b=CZSGA5c5btsYyu9XfBScd8xpao/Ss4jNGeNhLwEeT7PvX05hT2Mf/0WIuwa2Jltv2G Ca5ZPXFcJK9fn11iNAS2VTeUpiQB+9FT2In7Dc30iNPotjGqeXQgOH9Pfht4/X8HP+PW ktVtWAwhtX66FxghcYxsfbYTtcMoJXfELgfL3ofhjJDQIDxzicGj4MqEFz2RUUUdT0V5 WbRRwaQ0ETvyqImpzK5V7eWSjsyWdhfJ6mynPrvjhcoCeXfQ2Q/l/xV3V9+QNAO+1E7q o1fjaKzAWHKMleCIaW2HHGFFrPlZYXXuSS29J3Z4iWw+l+hoSOPJJm6lJoq+1YNwjmpT TxbQ== 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=KPYnm9ymVyGrK8s9jVIiw0QWJ+yeoaaW4FNJl81uekA2eYCwpdDC6GN4j7xD+wItiq CFWaFxbqDLIUu+MJBHWJHPpCkCnE260HX0siDJ0Nh2+wcJg+Vk+iBPnoB25KPyAqqnjl VPrNvqQoDBy4kAPLQWgmFovWnf8BR3HcyFzouB5EiUeNcY0rFQRTjKV/zEcupcfCJDdp vtiGQO2dw/cFbyf4ju/ETkVvnTtWvv7GkyGzb+fKmxLBHP4Na9awNo1OcxT1w0XElLa9 8QWyivgKc3QF55iRz0mvQ5K7LFniP0JYk2j9Ft4uDNirlm9dUTw4EJmEmTXJf6AgeHiQ GSDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1WNEZFr4; 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 ay16si21406520jab.96.2021.07.19.08.41.40; Mon, 19 Jul 2021 08:41:40 -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=1WNEZFr4; 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 S245423AbhGSPAo (ORCPT + 12 others); Mon, 19 Jul 2021 11:00:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:52468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343571AbhGSO7O (ORCPT ); Mon, 19 Jul 2021 10:59:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 52C1161287; Mon, 19 Jul 2021 15:36:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709015; bh=rQGy8cqcvQFQWXICBxVU7vxBghpZ8ulbRgzAOF6P3BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1WNEZFr4dqbYwLEXQSktVxT2PPB806kCTqNvy42pMjn4dSD/i1XKD0GTTEouhScPU TwHvh20sM22AcTgQaZfEkEQSVrarQiH9wipJ9/lpf4kWznT48HNBQXagimlx/geRef iD1nZwj2Ax9D9xV26eidX2WER21l7EmiAqlghh/M= 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.19 187/421] Input: hil_kbd - fix error return code in hil_dev_connect() Date: Mon, 19 Jul 2021 16:49:58 +0200 Message-Id: <20210719144952.903773509@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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; }