From f4dbe47488180b5aabf3c23093ef38ac25a00468 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 22 Jul 2010 01:16:48 +0000 Subject: [PATCH] --- yaml --- r: 203673 b: refs/heads/master c: 1ff219068c0e032a6fd64c45bd69f3bc7374feb6 h: refs/heads/master i: 203671: a9e08b8ba07d1ddf58324b34a61f6b6ee3dc418b v: v3 --- [refs] | 2 +- trunk/drivers/net/stmmac/dwmac1000_core.c | 2 ++ trunk/drivers/net/stmmac/dwmac100_core.c | 2 ++ trunk/drivers/net/stmmac/stmmac_main.c | 6 +++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d4ad7bde3980..e5c3f2e96ec5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b77026b391f4f43ca148cf6c55a93f7487ff6ed8 +refs/heads/master: 1ff219068c0e032a6fd64c45bd69f3bc7374feb6 diff --git a/trunk/drivers/net/stmmac/dwmac1000_core.c b/trunk/drivers/net/stmmac/dwmac1000_core.c index 917b4e16923b..2b2f5c8caf1c 100644 --- a/trunk/drivers/net/stmmac/dwmac1000_core.c +++ b/trunk/drivers/net/stmmac/dwmac1000_core.c @@ -220,6 +220,8 @@ struct mac_device_info *dwmac1000_setup(unsigned long ioaddr) ((uid & 0x0000ff00) >> 8), (uid & 0x000000ff)); mac = kzalloc(sizeof(const struct mac_device_info), GFP_KERNEL); + if (!mac) + return NULL; mac->mac = &dwmac1000_ops; mac->dma = &dwmac1000_dma_ops; diff --git a/trunk/drivers/net/stmmac/dwmac100_core.c b/trunk/drivers/net/stmmac/dwmac100_core.c index 6f270a0e151a..2fb165fa2ba0 100644 --- a/trunk/drivers/net/stmmac/dwmac100_core.c +++ b/trunk/drivers/net/stmmac/dwmac100_core.c @@ -179,6 +179,8 @@ struct mac_device_info *dwmac100_setup(unsigned long ioaddr) struct mac_device_info *mac; mac = kzalloc(sizeof(const struct mac_device_info), GFP_KERNEL); + if (!mac) + return NULL; pr_info("\tDWMAC100\n"); diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c index acf061686940..0bdd3326c94a 100644 --- a/trunk/drivers/net/stmmac/stmmac_main.c +++ b/trunk/drivers/net/stmmac/stmmac_main.c @@ -1558,15 +1558,15 @@ static int stmmac_mac_device_setup(struct net_device *dev) else device = dwmac100_setup(ioaddr); + if (!device) + return -ENOMEM; + if (priv->enh_desc) { device->desc = &enh_desc_ops; pr_info("\tEnhanced descriptor structure\n"); } else device->desc = &ndesc_ops; - if (!device) - return -ENOMEM; - priv->hw = device; priv->wolenabled = priv->hw->pmt; /* PMT supported */