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.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 4CF8FC433E0 for ; Mon, 10 Aug 2020 15:29:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 227EF22D74 for ; Mon, 10 Aug 2020 15:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073354; bh=B7ub19GZPui36HK+WZ3Se0D4ppcQnLcQoBNYj1qYxO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TTZVidJZ8pNsKKK+udRdESXaHPeDRzru2F+o1cVy/mkwFgQayUMWsQ9vFuuCDi9w4 0/Zp+bn8UmPdzlZvHjJxptBJnZxgr2667qnJLinOCcATRgEoRH3IqdRTDjvS5BGYAZ 2wG9TWSLSQPpkqCu0KGY3euAmotku8gzmRUbAh+M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728939AbgHJP3M (ORCPT ); Mon, 10 Aug 2020 11:29:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:35212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728929AbgHJP27 (ORCPT ); Mon, 10 Aug 2020 11:28:59 -0400 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 B081722BF3; Mon, 10 Aug 2020 15:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073339; bh=B7ub19GZPui36HK+WZ3Se0D4ppcQnLcQoBNYj1qYxO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t/Zse5MKWj+VgfpDutpxA465iJTU9ssCOUejMPGt5XqR3zFUvHAicsQj6jAtezeOb VbjRo/ei/2OUMikKH4i2aYcV+STQZqNm/XVXrZO0iAMHRj6GuFu5xBZn4ieoH62o5s hXUCidXHcMtxErbuQOeiBf192MUybCehkcmXlfxI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , "David S. Miller" Subject: [PATCH 5.4 58/67] dpaa2-eth: Fix passing zero to PTR_ERR warning Date: Mon, 10 Aug 2020 17:21:45 +0200 Message-Id: <20200810151812.374552391@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810151809.438685785@linuxfoundation.org> References: <20200810151809.438685785@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: YueHaibing [ Upstream commit 02afa9c66bb954c6959877c70d9e128dcf0adce7 ] Fix smatch warning: drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c:2419 alloc_channel() warn: passing zero to 'ERR_PTR' setup_dpcon() should return ERR_PTR(err) instead of zero in error handling case. Fixes: d7f5a9d89a55 ("dpaa2-eth: defer probe on object allocate") Signed-off-by: YueHaibing Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c @@ -2090,7 +2090,7 @@ close: free: fsl_mc_object_free(dpcon); - return NULL; + return ERR_PTR(err); } static void free_dpcon(struct dpaa2_eth_priv *priv, @@ -2114,8 +2114,8 @@ alloc_channel(struct dpaa2_eth_priv *pri return NULL; channel->dpcon = setup_dpcon(priv); - if (IS_ERR_OR_NULL(channel->dpcon)) { - err = PTR_ERR_OR_ZERO(channel->dpcon); + if (IS_ERR(channel->dpcon)) { + err = PTR_ERR(channel->dpcon); goto err_setup; }