diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-09-10 02:41:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-10 15:27:30 -0400 |
commit | e42de26249c88a00715ea686993192546d07133e (patch) | |
tree | 67006585135553897cafd08aaac41b586950a2c9 /drivers/net/sfc/efx.c | |
parent | 7db8e8ec3995a1dc2bfadd8ac97e9024013db9c3 (diff) |
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 b385f895bf23..a57604527a42 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) | |||
761 | /* Connect up MAC/PHY operations table */ | 761 | /* Connect up MAC/PHY operations table */ |
762 | rc = efx->type->probe_port(efx); | 762 | rc = efx->type->probe_port(efx); |
763 | if (rc) | 763 | if (rc) |
764 | goto err; | 764 | return rc; |
765 | 765 | ||
766 | /* Sanity check MAC address */ | 766 | /* Sanity check MAC address */ |
767 | if (is_valid_ether_addr(efx->mac_address)) { | 767 | if (is_valid_ether_addr(efx->mac_address)) { |
@@ -782,7 +782,7 @@ static int efx_probe_port(struct efx_nic *efx) | |||
782 | return 0; | 782 | return 0; |
783 | 783 | ||
784 | err: | 784 | err: |
785 | efx_remove_port(efx); | 785 | efx->type->remove_port(efx); |
786 | return rc; | 786 | return rc; |
787 | } | 787 | } |
788 | 788 | ||