Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / drivers / net / rtl8169.c

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index e45d1a52212d5739c096dcc1b105d5816666f128..b81dcad2ce5f92c9454732c5d0089ff0974dc1e4 100644 (file)
--- 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;