From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F2F0C3B1A6 for ; Fri, 14 Feb 2020 17:24:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EFC82168B for ; Fri, 14 Feb 2020 17:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581701058; bh=AJXW1CMLWcubyoLjPolCPobZXlVMMU/nqykdf1BmEWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pN5Ff/cyldktyJUuqHrksi58eLlm/VFtZ6PyTkNMT/IfFr+3G6L+CTyb14jijee1E pgZnt51RX6vj8vpkEFykbZNzxi8egZ9t2bZnFFQGKX4pu0F7bAuHnRUwsFkTwiVYh+ krU1NKqRj/XgrByOm2xopDG2eWJxFqzLcmsqr3U4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389549AbgBNRYP (ORCPT ); Fri, 14 Feb 2020 12:24:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:33318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391202AbgBNQJH (ORCPT ); Fri, 14 Feb 2020 11:09:07 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2D58D2467E; Fri, 14 Feb 2020 16:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696547; bh=AJXW1CMLWcubyoLjPolCPobZXlVMMU/nqykdf1BmEWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bnbgTKrWcmw6kSWgw0lEeRHPZ8SyRD7DD8+bKN6BTO1d1XpGGodjRAY/o7o5TAoV4 C1QEHUDmJxAW9rn+KcUNTi+9zmlPqWbZ1FFb+esy2jrn5uPntUZ5RENcRe7QKqPlrD vQHggx3TbzX+T6j+t7P5rJhN4cmoOBSIEe1VD1C8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , Borislav Petkov , Sasha Levin , linux-edac@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 340/459] EDAC/sifive: Fix return value check in ecc_register() Date: Fri, 14 Feb 2020 10:59:50 -0500 Message-Id: <20200214160149.11681-340-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214160149.11681-1-sashal@kernel.org> References: <20200214160149.11681-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org From: Wei Yongjun [ Upstream commit 6cd18453b68942913fd3b1913b707646e544c2ac ] In case of error, the function edac_device_alloc_ctl_info() returns a NULL pointer, not ERR_PTR(). Replace the IS_ERR() test in the return value check with a NULL test. Fixes: 91abaeaaff35 ("EDAC/sifive: Add EDAC platform driver for SiFive SoCs") Signed-off-by: Wei Yongjun Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20200115150303.112627-1-weiyongjun1@huawei.com Signed-off-by: Sasha Levin --- drivers/edac/sifive_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/edac/sifive_edac.c b/drivers/edac/sifive_edac.c index 413cdb4a591db..bb9ceeaf29bf9 100644 --- a/drivers/edac/sifive_edac.c +++ b/drivers/edac/sifive_edac.c @@ -54,8 +54,8 @@ static int ecc_register(struct platform_device *pdev) p->dci = edac_device_alloc_ctl_info(0, "sifive_ecc", 1, "sifive_ecc", 1, 1, NULL, 0, edac_device_alloc_index()); - if (IS_ERR(p->dci)) - return PTR_ERR(p->dci); + if (!p->dci) + return -ENOMEM; p->dci->dev = &pdev->dev; p->dci->mod_name = "Sifive ECC Manager"; -- 2.20.1