diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2010-09-10 06:41:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 12:27:30 -0700 |
| commit | e42de26249c88a00715ea686993192546d07133e (patch) | |
| tree | 67006585135553897cafd08aaac41b586950a2c9 /drivers/net/sfc/efx.c | |
| parent | 7db8e8ec3995a1dc2bfadd8ac97e9024013db9c3 (diff) | |
| download | linux-3.10-e42de26249c88a00715ea686993192546d07133e.tar.gz linux-3.10-e42de26249c88a00715ea686993192546d07133e.tar.bz2 linux-3.10-e42de26249c88a00715ea686993192546d07133e.zip | |
sfc: Fix failure paths in efx_probe_port()
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/efx.c')
| -rw-r--r-- | drivers/net/sfc/efx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index b385f895bf2..a57604527a4 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -761,7 +761,7 @@ static int efx_probe_port(struct efx_nic *efx) /* Connect up MAC/PHY operations table */ rc = efx->type->probe_port(efx); if (rc) - goto err; + return rc; /* Sanity check MAC address */ if (is_valid_ether_addr(efx->mac_address)) { @@ -782,7 +782,7 @@ static int efx_probe_port(struct efx_nic *efx) return 0; err: - efx_remove_port(efx); + efx->type->remove_port(efx); return rc; } |