From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B551CA0350; Mon, 22 Jun 2020 09:11:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 813FC1C238; Mon, 22 Jun 2020 09:06:22 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id B71221D526 for ; Mon, 22 Jun 2020 09:06:17 +0200 (CEST) IronPort-SDR: k66+y24bt5nTisayJ3I2rQqIzHrMQqECFXR5X9Yu7cMAlwYaSNqMHPB1O3feqtwCLo+4Z6eJvO CVv0f8TfFtdQ== X-IronPort-AV: E=McAfee;i="6000,8403,9659"; a="141944851" X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="141944851" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 00:06:17 -0700 IronPort-SDR: 2RtOf54/Ifht2vkIQcOD4wiNIkrTtbN1OSyc9hm00HMa4EuC28G6P8FQvzmS7fccvD+c88slwe vEoIm+sI0ujg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="384409018" Received: from dpdk.sh.intel.com ([10.239.255.83]) by fmsmga001.fm.intel.com with ESMTP; 22 Jun 2020 00:06:15 -0700 From: Guinan Sun To: dev@dpdk.org Cc: Jeff Guo , Zhao1 Wei , Guinan Sun , Sasha Neftin Date: Mon, 22 Jun 2020 06:45:56 +0000 Message-Id: <20200622064634.70941-33-guinanx.sun@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200622064634.70941-1-guinanx.sun@intel.com> References: <20200622064634.70941-1-guinanx.sun@intel.com> Subject: [dpdk-dev] [PATCH 32/70] net/e1000/base: modify the wrong return value X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Make 'init_phy_hw_reset_generic' method to be closest to the upstream method. Fix the return value to be same as in upstream. Fix unable to handle kernel NULL pointer dereference at 0x0 caused to kernel panic. Signed-off-by: Sasha Neftin Signed-off-by: Guinan Sun --- drivers/net/e1000/base/e1000_phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c index 73e2ecda8..bcb3df2f3 100644 --- a/drivers/net/e1000/base/e1000_phy.c +++ b/drivers/net/e1000/base/e1000_phy.c @@ -2905,7 +2905,7 @@ s32 e1000_phy_hw_reset_generic(struct e1000_hw *hw) phy->ops.release(hw); - return phy->ops.get_cfg_done(hw); + return ret_val; } /** -- 2.17.1