diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2022-01-07 11:02:06 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-16 12:56:31 +0100 |
| commit | efd399e12c1b5271955b594fd40256b445c8785f (patch) | |
| tree | 225906d89927e50abbc53ef71564fd9eb1f77754 | |
| parent | 12e067a4d98f1f74ac4efa632f40b6544b10aed1 (diff) | |
| download | linux-stable-efd399e12c1b5271955b594fd40256b445c8785f.tar.gz linux-stable-efd399e12c1b5271955b594fd40256b445c8785f.tar.bz2 linux-stable-efd399e12c1b5271955b594fd40256b445c8785f.zip | |
ice: fix an error code in ice_cfg_phy_fec()
[ Upstream commit 21338d58736ef70eaae5fd75d567a358ff7902f9 ]
Propagate the error code from ice_get_link_default_override() instead
of returning success.
Fixes: ea78ce4dab05 ("ice: add link lenient and default override support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index df5ad4de1f00..f4463e962d52 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -3272,7 +3272,8 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg, !ice_fw_supports_report_dflt_cfg(hw)) { struct ice_link_default_override_tlv tlv; - if (ice_get_link_default_override(&tlv, pi)) + status = ice_get_link_default_override(&tlv, pi); + if (status) goto out; if (!(tlv.options & ICE_LINK_OVERRIDE_STRICT_MODE) && |