From 1752c69f519d54440f3ce376a0e0f3660080af0b Mon Sep 17 00:00:00 2001 From: Frank Li Date: Wed, 6 Feb 2013 14:59:58 +0000 Subject: [PATCH] --- yaml --- r: 352129 b: refs/heads/master c: 365cc174648cd7e9b11e522c3d5b07ccf3c60d99 h: refs/heads/master i: 352127: 303694cf228a8dfc28fc9081e72180bb16372f4a v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e84aefeefabc..20dcc5abd8b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41b749201bbe54ce807c4287b4942e85cb0ca466 +refs/heads/master: 365cc174648cd7e9b11e522c3d5b07ccf3c60d99 diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c index 51215e1507dd..0fe68c46267e 100644 --- a/trunk/drivers/net/ethernet/freescale/fec.c +++ b/trunk/drivers/net/ethernet/freescale/fec.c @@ -1609,7 +1609,6 @@ static int fec_enet_init(struct net_device *ndev) } spin_lock_init(&fep->hw_lock); - spin_lock_init(&fep->tmreg_lock); fep->netdev = ndev; @@ -1841,6 +1840,9 @@ fec_probe(struct platform_device *pdev) fec_reset_phy(pdev); + if (fep->bufdesc_ex) + fec_ptp_init(ndev, pdev); + ret = fec_enet_init(ndev); if (ret) goto failed_init; @@ -1856,9 +1858,6 @@ fec_probe(struct platform_device *pdev) if (ret) goto failed_register; - if (fep->bufdesc_ex) - fec_ptp_init(ndev, pdev); - return 0; failed_register: