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

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

Comments

Nobuhiro Iwamatsu - Oct. 19, 2010, 5:03 a.m.
uli526x 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/uli526x.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Patch

diff --git a/drivers/net/uli526x.c b/drivers/net/uli526x.c
index 56eee7b..fca5c09 100644
--- a/drivers/net/uli526x.c
+++ b/drivers/net/uli526x.c
@@ -225,6 +225,11 @@  int uli526x_initialize(bd_t *bis)
 		iobase &= ~0xf;
 
 		dev = (struct eth_device *)malloc(sizeof *dev);
+		if (!dev) {
+			printf("uli526x: Can not allocate memory\n");
+			break;
+		}
+		memset(dev, 0, sizeof(*dev));
 		sprintf(dev->name, "uli526x#%d", card_number);
 		db = (struct uli526x_board_info *)
 			malloc(sizeof(struct uli526x_board_info));