diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-02-14 22:30:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 22:30:54 -0800 |
| commit | 5ecccb74dc91e22496a142b103ba958f93c29275 (patch) | |
| tree | b560b8974ec0e0478492d60753d45d8aea9db9b0 /drivers/net/sfc | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 (diff) | |
| parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| download | linux-dev-5ecccb74dc91e22496a142b103ba958f93c29275.tar.xz linux-dev-5ecccb74dc91e22496a142b103ba958f93c29275.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rate.c
Diffstat (limited to 'drivers/net/sfc')
| -rw-r--r-- | drivers/net/sfc/efx.c | 1 | ||||
| -rw-r--r-- | drivers/net/sfc/qt202x_phy.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index fafaf30ecd9a..dc58d9fd0f32 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c @@ -2284,6 +2284,7 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, fail2: efx_fini_struct(efx); fail1: + WARN_ON(rc > 0); EFX_LOG(efx, "initialisation failed. rc=%d\n", rc); free_netdev(net_dev); return rc; diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c index 14793d8bd661..1bee62c83001 100644 --- a/drivers/net/sfc/qt202x_phy.c +++ b/drivers/net/sfc/qt202x_phy.c @@ -320,7 +320,7 @@ static int qt202x_reset_phy(struct efx_nic *efx) falcon_board(efx)->type->init_phy(efx); - return rc; + return 0; fail: EFX_ERR(efx, "PHY reset timed out\n"); |