OSDN Git Service

ice: Check for bail out condition early
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tue, 2 Mar 2021 18:12:09 +0000 (10:12 -0800)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Wed, 31 Mar 2021 21:21:28 +0000 (14:21 -0700)
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>
drivers/net/ethernet/intel/ice/ice_ethtool.c

index 4f73842..109dd69 100644 (file)
@@ -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;