Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4569308pxv; Tue, 6 Jul 2021 04:17:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/aW9MEXToZYcvcF+MSQLcEji3hPdyfKN4xwdybqNesVWJUBa0PhinhL1shYhO8GLsjm+v X-Received: by 2002:a92:c952:: with SMTP id i18mr14056505ilq.218.1625570250645; Tue, 06 Jul 2021 04:17:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570250; cv=none; d=google.com; s=arc-20160816; b=g7TxM3R9aHnVv+sbhe3QNPgLc353Xkivtm0JB6ECyYit2NJ3P3lU+IY+s94W+HnKf2 Ucs44OU2XpT8J13rAM9ZUlTEm3O+cmM0dyHY8IEodz7fMyIB0Q8ndMV/v3p6b/H3UO0t 259wujGeMfdsajs3mPDX5+wYNZc4ectwSXbuW/k2Bgf3M1Vaq4MMOAl3uLJfkFd52SBR KIcQlsLKBc28eJZZjHq0Ofz9ZHeILudI7Bl6hDSU+d4Pa0mg3rlZW6K6DKICYmM+Yo6+ Ykxy+Ji4g4O4wkY4AplgzHIoKyL3rGuoC82Bm0ehVfJKYK1bUGmRVNHFtWsEfNwKmXJD xzTQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nPDeBdAjbif2RbKbuUT+sE5AM4RXOrGxfOZOsdUkfhs=; b=FkXdEz4PbcC4hWKXKZqN1cQRW5XKbxRE3mCmWRCgFS83V8bDCK1PYxbJBkZKmcJPCH QTQ4aMNr1uiNLxzVeEw1Ke6Y1Au8QO25KDlehSjNtzJANEi+p4oYR12N3R78FlSfUJSZ WlWoFwDlLVJRgwQSJe0bSypkFRZ1jXIGPERBmgjIw5JnhAikJVf5U505gcmPLuWpEStT DA3Ynh6OK1yBsYvMH+vrH0aRRkY3qLDWdtR2ggsOotet11NciHk+ZFq3JqlDo9xvCEsm bVAjMJhhHjIaL5siiRmDsDofEdb0vMGQkUz/KOgI9p4eO5/6pA6W9BvO9AYpQTNuVc+W S4FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=j9Q8jRt0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f10si12289920jar.27.2021.07.06.04.17.17; Tue, 06 Jul 2021 04:17:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=k20201202 header.b=j9Q8jRt0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232696AbhGFLS6 (ORCPT + 99 others); Tue, 6 Jul 2021 07:18:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:52590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232131AbhGFLRj (ORCPT ); Tue, 6 Jul 2021 07:17:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2532B61C28; Tue, 6 Jul 2021 11:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570100; bh=LexBJeL7GOk299JLac4Qe7GO0C5Z6j22bpkz07vVgj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j9Q8jRt01FEEcwF7UF7T+NgkSG6zSWYBb4rDyHd6e/5JAngkrN5k/cQakdaMDEeas no34A3EaMVjbJJBv9M3X3bvn3pfyymTI3NnznghmgGTOi2ZilggTaauR8QA0QGD7FR riM/EKWipw2S2i6Vlb8QXBqc3TOX2CqFxbwBm7tRpXerIW026itlf2yfDe3LPxQpk/ YgyYzYgoRvpujsahkpQMYFRLQCDy6Pjnferb8eMG2gZN1p6ixFugnSmn93QUtdca9y zrB6YOaeesUuBaM48l9S3VpQC8Q2qFzocReNWbimNyXs1ESProV1fA+8Q9/eE1EGaO HFcuaLZogQviw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , Hulk Robot , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 035/189] net: ethernet: ixp4xx: Fix return value check in ixp4xx_eth_probe() Date: Tue, 6 Jul 2021 07:11:35 -0400 Message-Id: <20210706111409.2058071-35-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit 20e76d3d044d936998617f8acd7e77bebd9ca703 ] In case of error, the function mdiobus_get_phy() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Reported-by: Hulk Robot Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/xscale/ixp4xx_eth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c index cb89323855d8..1ecceeb9700d 100644 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c @@ -1531,8 +1531,8 @@ static int ixp4xx_eth_probe(struct platform_device *pdev) phydev = of_phy_get_and_connect(ndev, np, ixp4xx_adjust_link); } else { phydev = mdiobus_get_phy(mdio_bus, plat->phy); - if (IS_ERR(phydev)) { - err = PTR_ERR(phydev); + if (!phydev) { + err = -ENODEV; dev_err(dev, "could not connect phydev (%d)\n", err); goto err_free_mem; } -- 2.30.2