leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sky2: handle network device allocation failure

Browse Source 
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>
This commit is contained in:
shemminger@linux-foundation.org 2007-01-26 11:38:36 -08:00 committed by Jeff Garzik
parent 2bf56fe25c
commit 7f60c64bd0
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/sky2.c
View File

@ -3339,7 +3339,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
static int __devinit sky2_probe(struct pci_dev *pdev, static int __devinit sky2_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev, *dev1 = NULL; struct net_device *dev;
struct sky2_hw *hw; struct sky2_hw *hw;
int err, using_dac = 0; int err, using_dac = 0;
@ -3423,8 +3423,10 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
hw->chip_id, hw->chip_rev); hw->chip_id, hw->chip_rev);
dev = sky2_init_netdev(hw, 0, using_dac); dev = sky2_init_netdev(hw, 0, using_dac);
if (!dev) if (!dev) {
err = -ENOMEM;
goto err_out_free_pci; goto err_out_free_pci;
}
if (!disable_msi && pci_enable_msi(pdev) == 0) { if (!disable_msi && pci_enable_msi(pdev) == 0) {
err = sky2_test_msi(hw); err = sky2_test_msi(hw);
@ -3452,13 +3454,19 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
sky2_show_addr(dev); sky2_show_addr(dev);
if (hw->ports > 1 && (dev1 = sky2_init_netdev(hw, 1, using_dac))) { if (hw->ports > 1) {
if (register_netdev(dev1) == 0) 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); sky2_show_addr(dev1);
else { else {
/* Failure to register second port need not be fatal */
printk(KERN_WARNING PFX printk(KERN_WARNING PFX
"register of second port failed\n"); "register of second port failed (%d)\n", err);
hw->dev[1] = NULL; hw->dev[1] = NULL;
free_netdev(dev1); free_netdev(dev1);
} }