From 7df5b2d527f421cc0f9389a8a07f4b1150ec8bb3 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 6 Jan 2010 06:54:16 +0000
Subject: [PATCH] --- yaml --- r: 179103 b: refs/heads/master c:
 2467ab9590092ffdf837e9283e84dedd04c93ab3 h: refs/heads/master i:   179101:
 711edb9ef1229f9b88a46ace078285c35095f401   179099:
 8676d9fe798e1fc557c6cfe646773f2c808adf70   179095:
 bd5711dd283953de28fc6187827c36e4d9107880   179087:
 f72f57d6c13893944b726969c8b1c498b64cc2fa   179071:
 268e057ac71e58751f19842ccff9c40416236e2e v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/atlx/atl2.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2797917e4d6d..fede169af057 100644
--- 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
index c0451d75cdcf..ec52529394ad 100644
--- 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;