From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597AbdJ3Iup (ORCPT ); Mon, 30 Oct 2017 04:50:45 -0400 Received: from m12-15.163.com ([220.181.12.15]:52364 "EHLO m12-15.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869AbdJ3Iuo (ORCPT ); Mon, 30 Oct 2017 04:50:44 -0400 From: Pan Bian To: Yisen Zhuang , Salil Mehta , "David S. Miller" , lipeng , Lin Yun Sheng , Kejian Yan , Tobias Klauser , Arnd Bergmann Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Pan Bian Subject: [PATCH] net: hns: set correct return value Date: Mon, 30 Oct 2017 16:50:01 +0800 Message-Id: <1509353401-2699-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: D8CowAD3o3e75_ZZ3PcjJQ--.49416S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrKryxCFWfuF1xXw1kZr4fKrg_yoWkXFb_u3 y29FyxJr4rKr1kKa1fW39xCry2kF40qw1kua1I9rZIkw13Cr15Ja4rXr10kr1kWw10vr90 9rnay3WSvF9FqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUneMNUUUUUU== X-Originating-IP: [106.120.213.14] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBUR6BclaDvyGfOgAAsS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function of_parse_phandle() returns a NULL pointer if it cannot resolve a phandle property to a device_node pointer. In function hns_nic_dev_probe(), its return value is passed to PTR_ERR to extract the error code. However, in this case, the extracted error code will always be zero, which is unexpected. Signed-off-by: Pan Bian --- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c index 3652063..e771926 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c @@ -2369,8 +2369,8 @@ static int hns_nic_dev_probe(struct platform_device *pdev) priv->enet_ver = AE_VERSION_2; ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0); - if (IS_ERR_OR_NULL(ae_node)) { - ret = PTR_ERR(ae_node); + if (!ae_node) { + ret = -ENODEV; dev_err(dev, "not find ae-handle\n"); goto out_read_prop_fail; } -- 1.9.1