diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2009-09-14 06:22:29 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-15 02:50:04 -0700 |
| commit | ca519274d537706b6fb1e3e91238d34a23320584 (patch) | |
| tree | ad527f92050b1ce7e7918c9f175df1cd993d2269 /drivers | |
| parent | 07e316377458484d95f7624f7af7af99d9bd18cb (diff) | |
| download | linux-3.10-ca519274d537706b6fb1e3e91238d34a23320584.tar.gz linux-3.10-ca519274d537706b6fb1e3e91238d34a23320584.tar.bz2 linux-3.10-ca519274d537706b6fb1e3e91238d34a23320584.zip | |
sky2: Make sure both ports initialize correctly
Sorry Mike, I sent you off the wrong way. The following is simpler and the
second port is diffrent enough in setup (because of NAPI), that the
following is simpler.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sky2.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index fc380331697..4bb52e9cd37 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -4550,16 +4550,18 @@ static int __devinit sky2_probe(struct pci_dev *pdev, if (hw->ports > 1) { struct net_device *dev1; + err = -ENOMEM; dev1 = sky2_init_netdev(hw, 1, using_dac, wol_default); - if (!dev1) - dev_warn(&pdev->dev, "allocation for second device failed\n"); - else if ((err = register_netdev(dev1))) { + if (dev1 && (err = register_netdev(dev1)) == 0) + sky2_show_addr(dev1); + else { dev_warn(&pdev->dev, "register of second port failed (%d)\n", err); hw->dev[1] = NULL; - free_netdev(dev1); - } else - sky2_show_addr(dev1); + hw->ports = 1; + if (dev1) + free_netdev(dev1); + } } setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw); |