Patchwork [U-Boot,03/10,v2] net: dc2114x: Add initialized eth_device structure

login
register
mail settings
Submitter Nobuhiro Iwamatsu
Date Oct. 19, 2010, 5:03 a.m.
Message ID <1287464627-12302-3-git-send-email-iwamatsu@nigauri.org>
Download mbox | patch
Permalink /patch/71874/
State Accepted
Headers show

Comments

Nobuhiro Iwamatsu - Oct. 19, 2010, 5:03 a.m.
dc2114x driver does not have write_hwaddr function.
However, eth stuff executes write_hwaddr function
because eth_device structure has not been initialized.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
CC: Ben Warren <biggerbadderben@gmail.com>
---
 drivers/net/dc2114x.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

Patch

diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 5ae53e8..9fd0ec8 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -279,6 +279,12 @@  int dc21x4x_initialize(bd_t *bis)
 		debug ("dc21x4x: DEC 21142 PCI Device @0x%x\n", iobase);
 
 		dev = (struct eth_device*) malloc(sizeof *dev);
+		
+		if (!dev) {
+			printf("Can not allocalte memory of dc21x4x\n");
+			break;
+		}
+		memset(dev, 0, sizeof(*dev));
 
 #ifdef CONFIG_TULIP_FIX_DAVICOM
 		sprintf(dev->name, "Davicom#%d", card_number);