From b5766b68290709add51c531a0db94c2e9fbbd89c Mon Sep 17 00:00:00 2001
From: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
Date: Tue, 23 Mar 2010 04:23:50 +0000
Subject: [PATCH] --- yaml --- r: 189033 b: refs/heads/master c:
 4881a4f89a95cc5fef6d32953954bcc3443eefd5 h: refs/heads/master i:   189031:
 8f5f15f745941c970480bf94355be08efefd8af8 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ksz884x.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index be2bdd617ea8..7a5e5c78efd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e039d84b323c4503c4d56863faa47c783660826
+refs/heads/master: 4881a4f89a95cc5fef6d32953954bcc3443eefd5
diff --git a/trunk/drivers/net/ksz884x.c b/trunk/drivers/net/ksz884x.c
index 0f59099ee72f..6c5327af1bf9 100644
--- a/trunk/drivers/net/ksz884x.c
+++ b/trunk/drivers/net/ksz884x.c
@@ -6322,7 +6322,7 @@ static int netdev_set_eeprom(struct net_device *dev,
 	int len;
 
 	if (eeprom->magic != EEPROM_MAGIC)
-		return 1;
+		return -EINVAL;
 
 	len = (eeprom->offset + eeprom->len + 1) / 2;
 	for (i = eeprom->offset / 2; i < len; i++)