diff options
| author | Mandy Lavi <mandy.lavi@freescale.com> | 2014-05-14 17:02:12 (GMT) |
|---|---|---|
| committer | Jose Rivera <German.Rivera@freescale.com> | 2014-05-16 12:22:18 (GMT) |
| commit | 5a93480a5a33eb6ce9626805b80a74adcd758245 (patch) | |
| tree | 826ad81bae1ecfc22457b130c0b8946a41b4e5a7 /drivers/net/ethernet/freescale/fman/src/wrapper | |
| parent | c17d121288f800db83024b15f55a447a070f1d62 (diff) | |
| download | linux-fsl-qoriq-5a93480a5a33eb6ce9626805b80a74adcd758245.tar.xz | |
fmd: fman advanced args should not be mandatory
Change-Id: I0080ab68d4658bf8eb855b6c4b43ed2526f2a878
Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/12366
Reviewed-by: Nir Erez <nir.erez@freescale.com>
Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Tested-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/src/wrapper')
| -rwxr-xr-x | drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c | 11 |
1 files changed, 7 insertions, 4 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 9815278..cdffe7a 100755 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c @@ -730,6 +730,9 @@ static t_Error CheckNConfigFmAdvArgs (t_LnxWrpFmDev *p_LnxWrpFmDev) err = FM_ConfigDmaAidMode(p_LnxWrpFmDev->h_Dev, e_FM_DMA_AID_OUT_PORT_ID); else if (strcmp(str_prop, "tnum") == 0) err = FM_ConfigDmaAidMode(p_LnxWrpFmDev->h_Dev, e_FM_DMA_AID_OUT_TNUM); + + if (err != E_OK) + RETURN_ERROR(MINOR, err, NO_MSG); } uint32_prop = (uint32_t *)of_get_property(dev_node, "tnum-aging-period", @@ -739,11 +742,11 @@ static t_Error CheckNConfigFmAdvArgs (t_LnxWrpFmDev *p_LnxWrpFmDev) RETURN_ERROR(MINOR, E_INVALID_VALUE, NO_MSG); err = FM_ConfigTnumAgingPeriod(p_LnxWrpFmDev->h_Dev, - (uint16_t)uint32_prop[0]/*tnumAgingPeriod*/); + (uint16_t)uint32_prop[0]/*tnumAgingPeriod*/); + + if (err != E_OK) + RETURN_ERROR(MINOR, err, NO_MSG); } - - if (err != E_OK) - RETURN_ERROR(MINOR, err, NO_MSG); of_node_put(dev_node); |