From patchwork Tue Jun 8 18:25:56 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: 455807 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp4014333jae; Tue, 8 Jun 2021 11:50:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIiruihbWeEv7g0AZ4h+chEDD9O2yQr0BUMOtSF6I41XIhfPAtnABnW6jw0jO24Qh1d9R3 X-Received: by 2002:a17:906:5f93:: with SMTP id a19mr24824261eju.18.1623178251426; Tue, 08 Jun 2021 11:50:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623178251; cv=none; d=google.com; s=arc-20160816; b=tQqwxtHtYBpOjZv/8e3p2gqCJ3t3zimjd4C80/kdMQOWoubdHGei+ugqUe+GhMkTef UY8efaouPyShwya9FjkevyhgRhuDXpopo4Bx/gmWY1lCn2OI7/WDD4+jRmw/q1yed9Jm BLd+xG5ktng6gzdje2p3tztykJwfLM3M67smo7FvMETIw3G3nl7JhMKt+FctSiQiTjsa h02a3EgxwISwrSes/eDIEyOM5FL9rZobA2o4E/sOHH+aSIRN6peaBzxX8S/xNsgTyfLG dC/PUvzXUubCsyIvF9o9RceBp8DI+LiVvIuaNWfz/IGp0HZ9UfwilhasoaszjsTRzkEO 9adA== 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=sReJtFFgHWfB194lIb4c6YlvZYepO2DZSiMTiyoY4uY=; b=zAdnR/7c4c2apr6IrEnxdjB2Z9EGggJ37ELmp3xxsQV2Er13UF0HLC5mNuV8Gk8TJ3 cgl8zCt6Np5Wmtoc16zCPEOL2stwthZpSAeP6gcD9icyO2pntZ1C/I4+xSqmg7d/bw1v 3yNL7eQ3tn9PK7wZc7jT1hRfSUquZ4oXrKtBH8+whf/vl575h+9Hub3mGBBFPhLTxwrq FeOztam/km2wVvMZgXsH1ZZjn5ABW5H/AL6fE5sC39ybdlhmrxkknYPk8GxGo+M3DhBU Xi0CX8g3Qojs+Ke1dYKNmDI/oVJrYJUQx9T8aFzVAaHmfwuXI55ZrU3qyqCMGQf11y6K ZI3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=plicAHLl; 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 p8si365256ejc.107.2021.06.08.11.50.51; Tue, 08 Jun 2021 11:50:51 -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=plicAHLl; 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 S235479AbhFHSwO (ORCPT + 12 others); Tue, 8 Jun 2021 14:52:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:47360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236061AbhFHSts (ORCPT ); Tue, 8 Jun 2021 14:49:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E608061426; Tue, 8 Jun 2021 18:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177556; bh=Y+x07ts2834sKo/W/TEPkYGXiOK6fWJ6EvOPwwmPx4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=plicAHLlNsMoEEwOA7fSfvMklp5kGLe7yUh995KLXrhcwikZr3wgVn3TUGywcNWJv +tN+b99P8pMB18USomxXk66qul+1OdwrlzXKehE4KRxTrT4TF36BWB02pGQhA2NxSx yevVT2g+pc86HE+WaLyQfW4dK14RpRx2ngseKzd8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Jiri Kosina , Sasha Levin Subject: [PATCH 5.10 016/137] HID: pidff: fix error return code in hid_pidff_init() Date: Tue, 8 Jun 2021 20:25:56 +0200 Message-Id: <20210608175942.954406863@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175942.377073879@linuxfoundation.org> References: <20210608175942.377073879@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 3dd653c077efda8152f4dd395359617d577a54cd ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 224ee88fe395 ("Input: add force feedback driver for PID devices") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/usbhid/hid-pidff.c | 1 + 1 file changed, 1 insertion(+) -- 2.30.2 diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c index fddac7c72f64..07a9fe97d2e0 100644 --- a/drivers/hid/usbhid/hid-pidff.c +++ b/drivers/hid/usbhid/hid-pidff.c @@ -1292,6 +1292,7 @@ int hid_pidff_init(struct hid_device *hid) if (pidff->pool[PID_DEVICE_MANAGED_POOL].value && pidff->pool[PID_DEVICE_MANAGED_POOL].value[0] == 0) { + error = -EPERM; hid_notice(hid, "device does not support device managed pool\n"); goto fail;