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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 A586EC35640 for ; Fri, 21 Feb 2020 07:55:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C1A5206ED for ; Fri, 21 Feb 2020 07:55:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271754; bh=Xidm1KLHeikUqJj0mf8sqeP5+U4+kFE95p+55aYHmkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1IKwTnXlS8G7JOUz/9cpG0i3oQdlJ9pVBdp+B+m85rDRgCumyQXLkrtSbJYxKR0o7 TnP5ryOi9IVnjlk2xjAUpfYPXBfj3OL366khchy5P+IcAJSdjQKQODiCyZxO3n0aIN F3tPkN6D/zRUvkY1heyvrYIbeNq8dAkZZpY0fVi8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730398AbgBUHzx (ORCPT ); Fri, 21 Feb 2020 02:55:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:54934 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728318AbgBUHzu (ORCPT ); Fri, 21 Feb 2020 02:55:50 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D4A95206ED; Fri, 21 Feb 2020 07:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271750; bh=Xidm1KLHeikUqJj0mf8sqeP5+U4+kFE95p+55aYHmkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tUyp6qEKKwbuKMBvsUtG7ovuphVVGUFiY5eB7RuoYl2t7RvAVmtk3WqsFeYq1I7/Y rEOSzUDdLhBmCThOFlbesCogkmRuS0RZ/t6CcYnZv0qFeR+SN4bfqibDpHxdlZKJyS Cp0McUsAh9ijY11hvSLlLM3beVHKAxvx4DK3fDIw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wei Yongjun , Borislav Petkov , Sasha Levin Subject: [PATCH 5.5 285/399] EDAC/sifive: Fix return value check in ecc_register() Date: Fri, 21 Feb 2020 08:40:10 +0100 Message-Id: <20200221072429.600413723@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 c0cc72a3b2be9..3a3dcb14ed99d 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