diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-20 17:06:55 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-20 17:06:55 -0600 |
| commit | 66541c6c99e5b3f850fa05308a465c4e365969de (patch) | |
| tree | 2ca8b8e019bf02b87418449da149fa1e58cd7639 /nuttx/arch | |
| parent | 4737ebbd575ff939b09e3c9f970eab096c1dfda9 (diff) | |
| download | px4-nuttx-66541c6c99e5b3f850fa05308a465c4e365969de.tar.gz px4-nuttx-66541c6c99e5b3f850fa05308a465c4e365969de.tar.bz2 px4-nuttx-66541c6c99e5b3f850fa05308a465c4e365969de.zip | |
Fix a commented out assertion
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/src/sama5/sam_hsmci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/sama5/sam_hsmci.c b/nuttx/arch/arm/src/sama5/sam_hsmci.c index 0f3106e4a..2bbc21b4b 100644 --- a/nuttx/arch/arm/src/sama5/sam_hsmci.c +++ b/nuttx/arch/arm/src/sama5/sam_hsmci.c @@ -836,7 +836,7 @@ static void sam_disablewaitints(struct sam_dev_s *priv, * operation. */ - flags = irqsave(); + flags = irqsave(); priv->waitevents = 0; priv->wkupevent = wkupevent; priv->waitmask = 0; @@ -1267,9 +1267,7 @@ static void sam_eventtimeout(int argc, uint32_t arg) struct sam_dev_s *priv = (struct sam_dev_s *)arg; DEBUGASSERT(argc == 1 && priv != NULL); - - /* This can, apparently, happen under certain race conditions */ - /* DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0); */ + DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) == 0); /* Is a data transfer complete event expected? */ |