diff options
| author | Li Yang <leoyang.li@nxp.com> | 2018-10-05 13:58:35 -0500 |
|---|---|---|
| committer | Li Yang <leoyang.li@nxp.com> | 2018-10-05 13:58:35 -0500 |
| commit | 56740a7167cbbbda99ebfd3e8b4e4d51ae39bd06 (patch) | |
| tree | 0db45d0dd63acaee2a3078acc47c31d2d851c68e /drivers/soc/fsl/qe | |
| parent | afa86d264a7ce62ba214bc7c6012e2129141421e (diff) | |
| parent | 5a1eb8b9542884592a018829bb1ff20c9695d925 (diff) | |
Merge tag 'soc-fsl-fix-v4.19-2' into HEAD
NXP/FSL SoC driver fixes for v4.19 round 2
- Fix crash of qman_portal by deferring its probe if qman is not probed
Diffstat (limited to 'drivers/soc/fsl/qe')
| -rw-r--r-- | drivers/soc/fsl/qe/ucc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/fsl/qe/ucc.c b/drivers/soc/fsl/qe/ucc.c index c646d8713861..681f7d4b7724 100644 --- a/drivers/soc/fsl/qe/ucc.c +++ b/drivers/soc/fsl/qe/ucc.c @@ -626,7 +626,7 @@ static u32 ucc_get_tdm_sync_shift(enum comm_dir mode, u32 tdm_num) { u32 shift; - shift = (mode == COMM_DIR_RX) ? RX_SYNC_SHIFT_BASE : RX_SYNC_SHIFT_BASE; + shift = (mode == COMM_DIR_RX) ? RX_SYNC_SHIFT_BASE : TX_SYNC_SHIFT_BASE; shift -= tdm_num * 2; return shift; |