diff options
| author | Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> | 2021-03-02 10:12:09 -0800 |
|---|---|---|
| committer | Tony Nguyen <anthony.l.nguyen@intel.com> | 2021-03-31 14:21:28 -0700 |
| commit | 805f980bfe0e7d07cd4cd5d1183722f0355c0f4a (patch) | |
| tree | 4f0dd38dfc305b5a26928bdc81c78c0d2a73e765 /drivers/net/ethernet/intel/ice/ice_ethtool.c | |
| parent | 800c1443cbe1bd17f11e3580744894c3ee1a5c8e (diff) | |
| download | linux-805f980bfe0e7d07cd4cd5d1183722f0355c0f4a.tar.gz linux-805f980bfe0e7d07cd4cd5d1183722f0355c0f4a.tar.bz2 linux-805f980bfe0e7d07cd4cd5d1183722f0355c0f4a.zip | |
ice: Check for bail out condition early
Check for bail out condition before calling ice_aq_sff_eeprom
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_ethtool.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c index 4f738425fb44..109dd6962b1d 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c @@ -3926,14 +3926,14 @@ ice_get_module_eeprom(struct net_device *netdev, u8 value = 0; u8 page = 0; - status = ice_aq_sff_eeprom(hw, 0, addr, offset, page, 0, - &value, 1, 0, NULL); - if (status) - return -EIO; - if (!ee || !ee->len || !data) return -EINVAL; + status = ice_aq_sff_eeprom(hw, 0, addr, offset, page, 0, &value, 1, 0, + NULL); + if (status) + return -EIO; + if (value == ICE_MODULE_TYPE_SFP) is_sfp = true; |