diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /drivers/net/ethernet/freescale/fec_main.c | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'drivers/net/ethernet/freescale/fec_main.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 81b96cf87574..50a851db2852 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c | |||
| @@ -1581,7 +1581,8 @@ fec_enet_interrupt(int irq, void *dev_id) | |||
| 1581 | complete(&fep->mdio_done); | 1581 | complete(&fep->mdio_done); |
| 1582 | } | 1582 | } |
| 1583 | 1583 | ||
| 1584 | fec_ptp_check_pps_event(fep); | 1584 | if (fep->ptp_clock) |
| 1585 | fec_ptp_check_pps_event(fep); | ||
| 1585 | 1586 | ||
| 1586 | return ret; | 1587 | return ret; |
| 1587 | } | 1588 | } |