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

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

Comments

Nobuhiro Iwamatsu - Oct. 19, 2010, 5:03 a.m.
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>
---
 drivers/net/rtl8169.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
Wolfgang Denk - Oct. 27, 2010, 6:52 p.m.
Dear Nobuhiro Iwamatsu,

In message <AANLkTinTt5pD40-Z+rvyWyf303nG9cMTE6wpAo_R2i+3@mail.gmail.com> you wrote:
> 
> Could you take in these patches?

Are these bug fixes, or can they wait for the "next" branch?

Best regards,

Wolfgang Denk

Patch

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index e45d1a5..d6bc514 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;