---

yaml --- r: 179103 b: refs/heads/master c: 2467ab9 h: refs/heads/master i: 179101: 711edb9 179099: 8676d9f 179095: bd5711d 179087: f72f57d 179071: 268e057 v: v3
git-mirror · Jan 7, 2010 · 7df5b2d · 7df5b2d
1 parent 91eb7a8
commit 7df5b2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c91aa55e7e65be11d68dffb66be5f7a44506fb54
+refs/heads/master: 2467ab9590092ffdf837e9283e84dedd04c93ab3
diff --git a/trunk/drivers/net/atlx/atl2.c b/trunk/drivers/net/atlx/atl2.c
@@ -1959,12 +1959,15 @@ static int atl2_get_eeprom(struct net_device *netdev,
 		return -ENOMEM;
 
 	for (i = first_dword; i < last_dword; i++) {
-		if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword])))
-			return -EIO;
+		if (!atl2_read_eeprom(hw, i*4, &(eeprom_buff[i-first_dword]))) {
+			ret_val = -EIO;
+			goto free;
+		}
 	}
 
 	memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3),
 		eeprom->len);
+free:
 	kfree(eeprom_buff);
 
 	return ret_val;