You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/05 21:02:32 UTC
[incubator-nuttx] branch master updated:
arch/arm/src/cxd56xx/cxd56_emmc.c: Don't wait for the semaphore if the task
was canceled.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new a5c619c arch/arm/src/cxd56xx/cxd56_emmc.c: Don't wait for the semaphore if the task was canceled.
a5c619c is described below
commit a5c619c20707c2523572ddbff08bb2860d4013cc
Author: Ouss4 <ab...@gmail.com>
AuthorDate: Sun Apr 5 20:27:03 2020 +0100
arch/arm/src/cxd56xx/cxd56_emmc.c: Don't wait for the semaphore if the
task was canceled.
---
arch/arm/src/cxd56xx/cxd56_emmc.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.c b/arch/arm/src/cxd56xx/cxd56_emmc.c
index 3ff6729..7bd93f9 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.c
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.c
@@ -441,21 +441,11 @@ static void emmc_send(int datatype, uint32_t opcode, uint32_t arg,
/* Wait for command or data transfer done */
- do
+ ret = emmc_takesem(&g_waitsem);
+ if (ret < 0)
{
- ret = emmc_takesem(&g_waitsem);
-
- /* The only expected error is ECANCELED which would occur if the
- * calling thread were canceled.
- */
-
- DEBUGASSERT(ret == OK || ret == -ECANCELED);
-
- /* REVISIT: emmc_taksem error is lost. This loop needs to save
- * the return from takesem and return it at the end.
- */
+ return;
}
- while (ret < 0);
/* Restore interrupt mask */