diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 464dc2d6cdb5..5165f1d3c98f 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -746,10 +746,12 @@ static __le16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
 		if (!(ctrl & eedo) && i > 16) {
 			u16 len = i - 16;
 
-			if (len > *addr_len)
+			if (len > *addr_len) {
 				*addr_len = 0;
-			else
-				*addr_len -= len;
+				break;
+			}
+
+			*addr_len -= len;
 			i = 17;
 		}
 
@@ -771,14 +773,14 @@ static int e100_eeprom_load(struct nic *nic)
 	/* Try reading with an 8-bit addr len to discover actual addr len */
 	e100_eeprom_read(nic, &addr_len, 0);
 
-	if (!addr_len || addr_len >= 16) {
+	if (!addr_len || addr_len > 8) {
 		netif_err(nic, probe, nic->netdev,
 			"Invalid EEPROM address length %u\n",
 			addr_len);
 		return -EIO;
 	}
 
-	nic->eeprom_wc = 1 << addr_len;
+	nic->eeprom_wc = (u16)BIT(addr_len);
 
 	for (addr = 0; addr < nic->eeprom_wc; addr++) {
 		nic->eeprom[addr] = e100_eeprom_read(nic, &addr_len, addr);
@@ -805,14 +807,14 @@ static int e100_eeprom_save(struct nic *nic, u16 start, u16 count)
 	/* Try reading with an 8-bit addr len to discover actual addr len */
 	e100_eeprom_read(nic, &addr_len, 0);
 
-	if (!addr_len || addr_len >= 16) {
+	if (!addr_len || addr_len > 8) {
 		netif_err(nic, probe, nic->netdev,
 			"Invalid EEPROM address length %u\n",
 			addr_len);
 		return -EIO;
 	}
 
-	nic->eeprom_wc = 1 << addr_len;
+	nic->eeprom_wc = (u16)BIT(addr_len);
 
 	if (start + count >= nic->eeprom_wc)
 		return -EINVAL;