diff options
| author |   Dan Carpenter <error27@gmail.com> | 2010-07-22 01:16:48 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-07-22 14:14:48 -0700 |
| commit | 1ff219068c0e032a6fd64c45bd69f3bc7374feb6 (patch) | |
| tree | 9978774f6e4f5b1fbcc2e6dd9e178e31f4c1a9e4 /drivers/net/stmmac | |
| parent | caif: precedence bug (diff) | |
| download | linux-dev-1ff219068c0e032a6fd64c45bd69f3bc7374feb6.tar.xz linux-dev-1ff219068c0e032a6fd64c45bd69f3bc7374feb6.zip | |
stmmac: handle allocation errors in setup functions
If the allocations fail in either dwmac1000_setup() or dwmac100_setup()
then return NULL. These are called from stmmac_mac_device_setup(). The
check for NULL returns in stmmac_mac_device_setup() needed to be moved
forward a couple lines.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac')
| -rw-r--r-- | drivers/net/stmmac/dwmac1000_core.c | 2 | ||||
| -rw-r--r-- | drivers/net/stmmac/dwmac100_core.c | 2 | ||||
| -rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c index 917b4e16923b..2b2f5c8caf1c 100644 --- a/drivers/net/stmmac/dwmac1000_core.c +++ b/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/drivers/net/stmmac/dwmac100_core.c b/drivers/net/stmmac/dwmac100_core.c index 6f270a0e151a..2fb165fa2ba0 100644 --- a/drivers/net/stmmac/dwmac100_core.c +++ b/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/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index acf061686940..0bdd3326c94a 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/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 */ |