From patchwork Tue Jun 8 18:26:51 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: 455792 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp3997248jae; Tue, 8 Jun 2021 11:32:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwntE6wP/i70oE1Pc8vTB860y19nZz0OokoEALiD+6LjFd5/obVEHAQMvqUbdHIqMbB9f3a X-Received: by 2002:a17:906:b104:: with SMTP id u4mr24685220ejy.211.1623177176252; Tue, 08 Jun 2021 11:32:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623177176; cv=none; d=google.com; s=arc-20160816; b=xvJWcD5TckRIQHfaMBOeYmSBS+K8wXpeFP9910iBVe7OOz1kPZCS+nhCvPyltaoWE2 0L85WfOEnbQ1KYWOnTtY70MPs+DkdqkcnHLp9HSdLuYE5A5AMVUYs2NJ5UdsIOsqS9Y4 5RTYXKrW4sJ1Nr/7CMT4syQNFAexL3epoV7EcM/fB6KGn9qJm6Derx5vKS/naMa0qjKr t30iUBm1GJANNuvGWbRcn1oguEjKTysc9uPC9gNA7H7iwHbeeLGt9QzyxH2Myyut65yP zYzfQmBXNAmDmQDPIvst4nwgHcG5okNHbAlu6YM/Rl6bPajwPXjSfsLPIZ9J/7o/w3dw BcdQ== 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=J7UZByMJSOAY6reM4//XCQ6dn1xKG/ywPwyWwiZHH0M=; b=Rxem2HScxjB+HZ/vBUl5CWdDlDG0cvPrWAKVBcjhudWLzdDG/6yzIqTdvMAUhnp/De zUDHmTPy8nRPOyARnT29JP2maeTwrjUvW66G/BnJZV3CCYhUVIxFkB09yxmxrnPRnt0a SLkIfuAWP0FYsvojifI8hKfz0gE9zbiJBPh16+LqBJixjcRef6vEUlKMS161DQ8ZyvrI q0beT2DysAxQtKWGn+xrAutFkizb99tYhvDVhPTCuLkvrYE1BW/FYrtlJqcE6sn1h1Z8 eJlZAdZmq9oRs2sWtyWV69uYP7c6qn4FE1MRma/20YMqHWyk0STGNweYXZDqVoF+0vLz FfPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kF2PGDfk; 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 w6si358667edl.187.2021.06.08.11.32.55; Tue, 08 Jun 2021 11:32:56 -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=kF2PGDfk; 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 S234197AbhFHSem (ORCPT + 12 others); Tue, 8 Jun 2021 14:34:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:56494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234384AbhFHSdP (ORCPT ); Tue, 8 Jun 2021 14:33:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B341E613C0; Tue, 8 Jun 2021 18:31:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177061; bh=lKpCVtXD3B8w7NgXNJYxyJ62U+u4UoNXBhi14EH6Lao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kF2PGDfk/nUnYrjAYblpey7q7vfwdtBngnctCZ/9lufEG+lSMaCTX7JFtCUgYE8yp p4aLIaS1yCz7o8BpXHRxhxf25oRilnUd+KyE54A+fEOYe+Y0XcsuijV1u3EvXXfUcQ CpHfNe2TZKy1ThzVrUqt3rLVX54Hi4DkSLNuoxTc= 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 4.14 08/47] HID: pidff: fix error return code in hid_pidff_init() Date: Tue, 8 Jun 2021 20:26:51 +0200 Message-Id: <20210608175930.754090822@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175930.477274100@linuxfoundation.org> References: <20210608175930.477274100@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 08174d341f4a..bc75f1efa0f4 100644 --- a/drivers/hid/usbhid/hid-pidff.c +++ b/drivers/hid/usbhid/hid-pidff.c @@ -1304,6 +1304,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;