From patchwork Tue Jun 8 18:26:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 455783 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp3994165jae; Tue, 8 Jun 2021 11:30:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKC899V35gYiQiHTyQjzDaFzB6Dss9bo75PxZyUlTS/9rCEYPCstJEvinrxyttmpUbMnIP X-Received: by 2002:aa7:c3ce:: with SMTP id l14mr26890617edr.99.1623177016115; Tue, 08 Jun 2021 11:30:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623177016; cv=none; d=google.com; s=arc-20160816; b=DksG05Zx4Jre7oYuqzXTfSwYguo5iDfltkU9Z/QerLACJrf5TnEzGfKgGXvc1alGER /AiTd5WKQ57AJgbrNkfsqVp5KoCEv20Lcczia946yl6KQ4ncR1KWy89mEzjaaz4EbT8P /ieyh9Y4T0Ef91zM3PpmesAph18qLONe0QbrX013jdr0HpMtraQRNldWDSniljwEkqrn GhDsGU7YkCKXqcwqogLucPXTafVghVHNr+3S/aYZ65OryoVzukhBAkZcjtOT9w4GVs5X 8GZbFVr1MH/gjR5vgCLMbQi686UHSF06jZ2/yFwncrHDahS6Gb4j1aaezP/nIMiCe8UJ fmRQ== 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=IbFwqM+rUhVyeTrMZbi/S978WjOYhNrDpixCMNivNbvYlxjAJp5Ahn60jMHHzCKsGp 69OT0ICv+ZLNQwUn+Az89L1wl1KPM4+5cLS8HS2UGQt2Ui0l8FCpMzQOh79P6ARitsMb fbDum5HTwJHo3G5QFli7ahN+nuwuEfwDF3vzG2bcJB4w9FFQxKtYB1/UfpKpTktSO/6m j5EvuE2Q3l99jir5/4TBKyVym1HxwsO1dTSRGnplawINOBc0OMkeZOhVJ4xtV3O8JPH8 mNZq33r6oXyQlxri6N9sITU6hcl7UNeFcOwprPiHN43sLOlmrMoPlerUmzEVTiRUrmqH 6rvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=C5gouUi8; 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 e17si416787ejm.271.2021.06.08.11.30.15; Tue, 08 Jun 2021 11:30:16 -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=C5gouUi8; 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 S234008AbhFHSa5 (ORCPT + 12 others); Tue, 8 Jun 2021 14:30:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:55748 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233801AbhFHSa4 (ORCPT ); Tue, 8 Jun 2021 14:30:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C07BC613AC; Tue, 8 Jun 2021 18:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623176943; bh=lKpCVtXD3B8w7NgXNJYxyJ62U+u4UoNXBhi14EH6Lao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C5gouUi8IevNdoJ5L3gsSrIxH2VQJpJMEeYflVoj3H9/eM+U5HshC/pKO+ojjZc1r 9x7h5c18UOBft6r6DdkuS8sgIO9AJkUfLzYlakwOPAPbsuTEe6A89AQQwt3wbY3xxf K1sz13LFfG1G6NXL30zddy8zxgKD/qBqSZyJrdSc= 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.4 05/23] HID: pidff: fix error return code in hid_pidff_init() Date: Tue, 8 Jun 2021 20:26:57 +0200 Message-Id: <20210608175926.720537449@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175926.524658689@linuxfoundation.org> References: <20210608175926.524658689@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;