summaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/qt202x_phy.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-15 07:30:54 +0100
committerDavid S. Miller <davem@davemloft.net>2010-02-15 07:30:54 +0100
commit5ecccb74dc91e22496a142b103ba958f93c29275 (patch)
treeb560b8974ec0e0478492d60753d45d8aea9db9b0 /drivers/net/sfc/qt202x_phy.c
parentMerge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin... (diff)
parentMerge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin... (diff)
downloadlinux-5ecccb74dc91e22496a142b103ba958f93c29275.tar.xz
linux-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/qt202x_phy.c')
-rw-r--r--drivers/net/sfc/qt202x_phy.c2
1 files changed, 1 insertions, 1 deletions
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");