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,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 6B2A8C433E0 for ; Mon, 10 Aug 2020 15:39:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4682823125 for ; Mon, 10 Aug 2020 15:39:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073968; bh=daB+xSwsKq1kHM+/l7j584ZlN+Y27tIZJhrJlaziGrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bfJbj9zvQMVCssT5isXD/klOg7QmKWjmcf1IgbyyIVczgDE3oFSVLRCDi/IuNJKte tU0Gb+OmTu6RBeVeR0W8e5ClKPPLKo2+xP874QCJ7OQCBDg/yvnYo4gWVkd3UsdY7i Fq1UAUwd2IXWAfFeojjYOrYD8hK/JEgvEzEl85o8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726499AbgHJPjX (ORCPT ); Mon, 10 Aug 2020 11:39:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:58462 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728455AbgHJPYy (ORCPT ); Mon, 10 Aug 2020 11:24:54 -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 D76DF20855; Mon, 10 Aug 2020 15:24:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073094; bh=daB+xSwsKq1kHM+/l7j584ZlN+Y27tIZJhrJlaziGrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m7QeI/cPpeyEYG35CTo9NqgXdyy7oDPZjrLgsva1qPPPGhwwsIdRjWMejZ9LHo3xS 8PkSMGbW7jm8iOxRaeQPVkQGe5PQSY86Ksb87J062/aEm+pZ+LzVPBUvaLPLsGWL5l 85q8ZUg8HCxK6J02XWOCJvwQynexP0KKAnNDiFFY= 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.7 64/79] dpaa2-eth: Fix passing zero to PTR_ERR warning Date: Mon, 10 Aug 2020 17:21:23 +0200 Message-Id: <20200810151815.400579929@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810151812.114485777@linuxfoundation.org> References: <20200810151812.114485777@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -2120,7 +2120,7 @@ close: free: fsl_mc_object_free(dpcon); - return NULL; + return ERR_PTR(err); } static void free_dpcon(struct dpaa2_eth_priv *priv, @@ -2144,8 +2144,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; }