diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c
index 5f9e0f9..0b20290 100644
--- a/nicintel_eeprom.c
+++ b/nicintel_eeprom.c
@@ -411,8 +411,10 @@
 
 static int nicintel_ee_shutdown_i210(void *arg)
 {
+	int ret = 0;
+
 	if (!done_i20_write)
-		return 0;
+		goto out;
 
 	uint32_t flup = pci_mmio_readl(nicintel_eebar + EEC);
 
@@ -422,11 +424,13 @@
 	int i;
 	for (i = 0; i < MAX_ATTEMPTS; i++)
 		if (pci_mmio_readl(nicintel_eebar + EEC) & BIT(EE_FLUDONE))
-			return 0;
+			goto out;
 
+	ret = -1;
 	msg_perr("Flash update failed\n");
 
-	return -1;
+out:
+	return ret;
 }
 
 static int nicintel_ee_shutdown_82580(void *eecp)