From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Tue, 19 Oct 2010 05:03:38 +0000 (+0900)
Subject: net: rtl8169: Add initialized eth_device structure
X-Git-Tag: v2010.12-rc2~78
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f4eaef7b2e4b0b6f2fd6b7120d57804c226997e0;p=oweals%2Fu-boot.git

net: rtl8169: Add initialized eth_device structure

rtl8169 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>
---

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index e45d1a5221..b81dcad2ce 100644
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -894,7 +894,12 @@ int rtl8169_initialize(bd_t *bis)
 		debug ("rtl8169: REALTEK RTL8169 @0x%x\n", iobase);
 
 		dev = (struct eth_device *)malloc(sizeof *dev);
+		if (!dev) {
+			printf("Can not allocate memory of rtl8169\n");
+			break;
+		}
 
+		memset(dev, 0, sizeof(*dev));
 		sprintf (dev->name, "RTL8169#%d", card_number);
 
 		dev->priv = (void *) devno;