diff options
| author | shemminger@linux-foundation.org <shemminger@linux-foundation.org> | 2007-01-26 19:38:36 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-05 21:58:49 (GMT) |
| commit | 7f60c64bd0e7262b51faefcce5d8df9d51d84b60 (patch) | |
| tree | 95e1abd4cc6fe82d6b146113eda8fa15a9c8603a /drivers/net | |
| parent | 2bf56fe25cef2a7652f7b2ab37ac14a336c76c75 (diff) | |
| download | linux-7f60c64bd0e7262b51faefcce5d8df9d51d84b60.tar.xz | |
sky2: handle network device allocation failure
If alloc_etherdev() failed, then sky2_init_netdev will return NULL,
and sky2_probe would end up returning 0 instead of -ENOMEM.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sky2.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 9474391..bf1abf0 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -3339,7 +3339,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw) static int __devinit sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { - struct net_device *dev, *dev1 = NULL; + struct net_device *dev; struct sky2_hw *hw; int err, using_dac = 0; @@ -3423,8 +3423,10 @@ static int __devinit sky2_probe(struct pci_dev *pdev, hw->chip_id, hw->chip_rev); dev = sky2_init_netdev(hw, 0, using_dac); - if (!dev) + if (!dev) { + err = -ENOMEM; goto err_out_free_pci; + } if (!disable_msi && pci_enable_msi(pdev) == 0) { err = sky2_test_msi(hw); @@ -3452,13 +3454,19 @@ static int __devinit sky2_probe(struct pci_dev *pdev, sky2_show_addr(dev); - if (hw->ports > 1 && (dev1 = sky2_init_netdev(hw, 1, using_dac))) { - if (register_netdev(dev1) == 0) + if (hw->ports > 1) { + struct net_device *dev1; + + dev1 = sky2_init_netdev(hw, 1, using_dac); + if (!dev1) { + printk(KERN_WARNING PFX + "allocation of second port failed\n"); + } + else if (!(err = register_netdev(dev1))) sky2_show_addr(dev1); else { - /* Failure to register second port need not be fatal */ printk(KERN_WARNING PFX - "register of second port failed\n"); + "register of second port failed (%d)\n", err); hw->dev[1] = NULL; free_netdev(dev1); } |