summaryrefslogtreecommitdiff
path: root/cesar/hal
diff options
context:
space:
mode:
authorNélio Laranjeiro2013-01-30 15:19:45 +0100
committerNélio Laranjeiro2013-02-01 10:30:56 +0100
commit697f4dc5806aa3f4f1651b63ca8196e98c8f5c33 (patch)
treef62927a69ce455c808100af029b2ba3c087ef9a6 /cesar/hal
parent80adac5df9b6bff88c5e041a32a0ee0fcfe35456 (diff)
parent597bd75f5080087e5cc357670e687133e56e1350 (diff)
Merge branch 'master-t3666-bridgedma-freeze' into eoc-drv-t3666-bridgedma-freeze
Diffstat (limited to 'cesar/hal')
-rw-r--r--cesar/hal/phy/src/bridgedma.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cesar/hal/phy/src/bridgedma.c b/cesar/hal/phy/src/bridgedma.c
index b01ab9e958..31d9c20f87 100644
--- a/cesar/hal/phy/src/bridgedma.c
+++ b/cesar/hal/phy/src/bridgedma.c
@@ -274,6 +274,7 @@ phy_bridgedma_stopped (phy_bridgedma_t *ctx)
u32 expired = phy_date () + MAC_MS_TO_TCK (PHY_BRG_POLLING_WAIT_MS);
while (_phy_bridgedma_status (ctx) && less_mod2p32 (phy_date (), expired))
;
- dbg_assert_print (less_mod2p32 (phy_date (), expired),
+ dbg_assert_print (_phy_bridgedma_status (ctx)
+ || less_mod2p32 (phy_date (), expired),
"Bridge DMA freezed");
}