Skip to contentSkip to conversation

Fix cs8900 dev->priv not init issue

PATCH New Hui.Tang 2 participants 2 messages Nov 5, 2009 – Nov 9, 2009 Network drivers

lore
Share & tools
lore

Hui.Tang

author
#0 lore raw

PATCH 1/1 Fix cs8900 dev->priv not init issue

Fix cs8900 dev->priv not init issue, do it as Ben Warren's suggestion.

---
 drivers/net/cs8900.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/cs8900.c +4 -3
index 587f7f6..a9d1f22 100644
@@ -321,15 +321,16 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 	memset(priv, 0, sizeof(*priv));
 	priv->regs = (struct cs8900_regs *)base_addr;
 
-	/* Load MAC address from EEPROM */
-	cs8900_get_enetaddr(dev);
-
 	dev->iobase = base_addr;
 	dev->priv = priv;
 	dev->init = cs8900_init;
 	dev->halt = cs8900_halt;
 	dev->send = cs8900_send;
 	dev->recv = cs8900_recv;
+
+	/* Load MAC address from EEPROM */
+	cs8900_get_enetaddr(dev);
+
 	sprintf(dev->name, "%s-%hu", CS8900_DRIVERNAME, dev_num);
 
 	eth_register(dev);
Signature · 1 line
1.6.0.4
Applied
#1 lore raw

PATCH 1/1 Fix cs8900 dev->priv not init issue

Quoted 22 lines · Hui.Tang

Fix cs8900 dev->priv not init issue, do it as Ben Warren's suggestion.

---
 drivers/net/cs8900.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/cs8900.c +0 -3
index 587f7f6..a9d1f22 100644
@@ -321,15 +321,16 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 	memset(priv, 0, sizeof(*priv));
 	priv->regs = (struct cs8900_regs *)base_addr;
 
-	/* Load MAC address from EEPROM */
-	cs8900_get_enetaddr(dev);
-
 	dev->iobase = base_addr;
 	dev->priv = priv;
 	dev->init = cs8900_init;

drivers/net/cs8900.c int cs8900_initialize(u8 dev_num, int base_addr) · line 336

Quoted 10 lines
drivers/net/cs8900.c +4 -0
 	dev->halt = cs8900_halt;
 	dev->send = cs8900_send;
 	dev->recv = cs8900_recv;
+
+	/* Load MAC address from EEPROM */
+	cs8900_get_enetaddr(dev);
+
 	sprintf(dev->name, "%s-%hu", CS8900_DRIVERNAME, dev_num);
 
 	eth_register(dev);

Applied to net repo with minor commit message editing.

thanks,
Ben