diff options
| author | Eyal Harari <Eyal.Harari@freesacle.com> | 2014-09-17 11:53:05 (GMT) |
|---|---|---|
| committer | Richard Schmitt <richard.schmitt@freescale.com> | 2014-09-19 14:31:31 (GMT) |
| commit | c389efaced25672b600a6a9c26c8bb1aefd8eca3 (patch) | |
| tree | 6e14649838b0f5eb3246b1904aa2e3d07816d175 /drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c | |
| parent | 277ed7a2df8a53288cf08b61a7d44e916021fd49 (diff) | |
| download | linux-fsl-qoriq-c389efaced25672b600a6a9c26c8bb1aefd8eca3.tar.xz | |
FMD: DSAR: Don't disable/enable Tx explicitly. Change call to exit DSAR to fm_soc_resume
Signed-off-by: Eyal Harari <Eyal.Harari@freesacle.com>
Change-Id: I888b95ca0c7f2e13266ecf81c41e779666a6e612
Reviewed-on: http://git.am.freescale.net:8181/19106
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Cristian-Constantin Sovaiala <Cristian.Sovaiala@freescale.com>
Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c')
| -rwxr-xr-x | drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c index 1c398cf..b9a2097 100755 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c @@ -1159,6 +1159,8 @@ static int fm_soc_resume(struct device *dev) fsl_set_power_except(dev,0); device_set_wakeup_enable(p_LnxWrpFmDev->dev, 0); #endif + FM_PORT_ExitDsar(p_LnxWrpFmDev->h_DsarRxPort, + p_LnxWrpFmDev->h_DsarTxPort); p_LnxWrpFmDev->h_DsarRxPort = 0; p_LnxWrpFmDev->h_DsarTxPort = 0; } @@ -1417,9 +1419,6 @@ EXPORT_SYMBOL(fm_port_enter_autores_for_deepsleep); void fm_port_exit_auto_res_for_deep_sleep(struct fm_port *port_rx, struct fm_port *port_tx) { - t_LnxWrpFmPortDev *p_LnxWrpFmPortDevRx = (t_LnxWrpFmPortDev *)port_rx; - t_LnxWrpFmPortDev *p_LnxWrpFmPortDevTx = (t_LnxWrpFmPortDev *)port_tx; - FM_PORT_ExitDsar(p_LnxWrpFmPortDevRx->h_Dev, p_LnxWrpFmPortDevTx->h_Dev); } EXPORT_SYMBOL(fm_port_exit_auto_res_for_deep_sleep); @@ -1436,8 +1435,6 @@ EXPORT_SYMBOL(fm_port_get_autores_stats); int fm_port_suspend(struct fm_port *port) { t_LnxWrpFmPortDev *p_LnxWrpFmPortDev = (t_LnxWrpFmPortDev *)port; - if (p_LnxWrpFmPortDev->id == 3) - return 0; if (!FM_PORT_IsInDsar(p_LnxWrpFmPortDev->h_Dev)) return FM_PORT_Disable(p_LnxWrpFmPortDev->h_Dev); else |