From: Nisar Sayed <Nisar.Sayed@microchip.com>
To: <davem@davemloft.net>
Cc: <UNGLinuxDriver@microchip.com>, <netdev@vger.kernel.org>
Subject: [PATCH v5 net 2/3] lan78xx: Allow EEPROM write for less than MAX_EEPROM_SIZE
Date: Thu, 21 Sep 2017 02:36:37 +0530 [thread overview]
Message-ID: <20170920210638.11150-3-Nisar.Sayed@microchip.com> (raw)
In-Reply-To: <20170920210638.11150-1-Nisar.Sayed@microchip.com>
Allow EEPROM write for less than MAX_EEPROM_SIZE
Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
Signed-off-by: Nisar Sayed <Nisar.Sayed@microchip.com>
---
drivers/net/usb/lan78xx.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index fcf85ae37435..f8c63eec8353 100644
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -1290,11 +1290,10 @@ static int lan78xx_ethtool_set_eeprom(struct net_device *netdev,
if (ret)
return ret;
- /* Allow entire eeprom update only */
- if ((ee->magic == LAN78XX_EEPROM_MAGIC) &&
- (ee->offset == 0) &&
- (ee->len == 512) &&
- (data[0] == EEPROM_INDICATOR))
+ /* Invalid EEPROM_INDICATOR at offset zero will result in a failure
+ * to load data from EEPROM
+ */
+ if (ee->magic == LAN78XX_EEPROM_MAGIC)
ret = lan78xx_write_raw_eeprom(dev, ee->offset, ee->len, data);
else if ((ee->magic == LAN78XX_OTP_MAGIC) &&
(ee->offset == 0) &&
--
2.14.1
next prev parent reply other threads:[~2017-09-20 15:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-20 21:06 [PATCH v5 net 0/3] lan78xx: This series of patches are for lan78xx driver Nisar Sayed
2017-09-20 21:06 ` [PATCH v5 net 1/3] lan78xx: Fix for eeprom read/write when device auto suspend Nisar Sayed
2017-09-20 21:06 ` Nisar Sayed [this message]
2017-09-20 21:06 ` [PATCH v5 net 3/3] lan78xx: Use default values loaded from EEPROM/OTP after reset Nisar Sayed
2017-09-21 22:23 ` [PATCH v5 net 0/3] lan78xx: This series of patches are for lan78xx driver David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170920210638.11150-3-Nisar.Sayed@microchip.com \
--to=nisar.sayed@microchip.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).