aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/platforms/STM32/can_lld.c
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-03-09 11:33:50 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-03-09 11:33:50 +0000
commit34f87048152152afa2f828d5b4c7623a3791690b (patch)
tree9731de4dc22f67cdf476a20b97d1ddab6b8e8586 /os/hal/platforms/STM32/can_lld.c
parent80f779fde879ed171f6ac58bbb22cec9185ae138 (diff)
downloadChibiOS-34f87048152152afa2f828d5b4c7623a3791690b.tar.gz
ChibiOS-34f87048152152afa2f828d5b4c7623a3791690b.tar.bz2
ChibiOS-34f87048152152afa2f828d5b4c7623a3791690b.zip
Fixed bug 3606673.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5393 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/STM32/can_lld.c')
-rw-r--r--os/hal/platforms/STM32/can_lld.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/os/hal/platforms/STM32/can_lld.c b/os/hal/platforms/STM32/can_lld.c
index 7dab31faf..382322fff 100644
--- a/os/hal/platforms/STM32/can_lld.c
+++ b/os/hal/platforms/STM32/can_lld.c
@@ -569,7 +569,8 @@ bool_t can_lld_is_rx_nonempty(CANDriver *canp, canmbx_t mailbox) {
switch (mailbox) {
case CAN_ANY_MAILBOX:
- return (canp->can->RF0R & (CAN_RF0R_FMP0 | CAN_RF1R_FMP1)) != 0;
+ return ((canp->can->RF0R & CAN_RF0R_FMP0) != 0 ||
+ (canp->can->RF1R & CAN_RF1R_FMP1) != 0);
case 1:
return (canp->can->RF0R & CAN_RF0R_FMP0) != 0;
case 2: