Skip to contentSkip to conversation

cs8900 assign dev->priv before using it

PATCH New Hui.Tang 2 participants 3 messages Oct 29, 2009 – Oct 30, 2009 Network drivers

lore
Share & tools
lore

Hui.Tang

author
#0 lore raw

PATCH 1/1 cs8900 assign dev->priv before using it

cs8900_get_enetaddr() call get_reg_init_bus(), which will use dev->priv in CONFIG_CS8900_BUS16 config, so we should assign dev->priv before using it.

---
 drivers/net/cs8900.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/cs8900.c +1 -1
index 587f7f6..962b74c 100644
@@ -320,12 +320,12 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 	}
 	memset(priv, 0, sizeof(*priv));
 	priv->regs = (struct cs8900_regs *)base_addr;
+	dev->priv = priv;
 
 	/* 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;
Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 1/1 cs8900 assign dev->priv before using it

Hello Hui,

Quoted 15 lines · Hui.Tang

cs8900_get_enetaddr() call get_reg_init_bus(), which will use dev->priv in CONFIG_CS8900_BUS16 config, so we should assign dev->priv before using it.

---
 drivers/net/cs8900.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/cs8900.c +0 -0
index 587f7f6..962b74c 100644
@@ -320,12 +320,12 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 	}
 	memset(priv, 0, sizeof(*priv));
 	priv->regs = (struct cs8900_regs *)base_addr;

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

Quoted 10 lines
drivers/net/cs8900.c +1 -1
+	dev->priv = priv;
 
 	/* 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;

Thanks for catching this. I'd prefer to move the
'cs8900_get_enetaddr() call to below all the function pointer assignments. In the interest of getting this bug fix in the current release, I'll just modify your patch and apply it.

Next time please remember your signed-off-by line.

regards,
Ben

author
#2 lore raw

PATCH 1/1 cs8900 assign dev->priv before using it

Hi Ben,

Quoted 1 line

Next time please remember your signed-off-by line.

OK, thanks.

BR.
Hui.