From cd6c66301a83dde9ad4eaf675459a0348f4732cf Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 18 Jul 2016 13:12:11 -0700 Subject: resync with FreeRTOS_iMX7D_1.0.1 GA --- platform/drivers/src/flexcan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'platform/drivers/src/flexcan.c') diff --git a/platform/drivers/src/flexcan.c b/platform/drivers/src/flexcan.c index 2fb1d16..bd9290a 100644 --- a/platform/drivers/src/flexcan.c +++ b/platform/drivers/src/flexcan.c @@ -257,14 +257,14 @@ void FLEXCAN_SetTiming(CAN_Type* base, const flexcan_timing_t* timing) *END**************************************************************************/ void FLEXCAN_SetOperatingMode(CAN_Type* base, uint8_t mode) { - assert((mode & flexCanNormalMode) || + assert((mode & flexcanNormalMode) || (mode & flexcanListenOnlyMode) || (mode & flexcanLoopBackMode)); /* Assert Freeze mode*/ FLEXCAN_EnterFreezeMode(base); - if (mode & flexCanNormalMode) + if (mode & flexcanNormalMode) CAN_MCR_REG(base) &= ~CAN_MCR_SUPV_MASK; else CAN_MCR_REG(base) |= CAN_MCR_SUPV_MASK; -- cgit v1.2.3