diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-14 19:30:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-14 19:30:31 +0000 |
| commit | e135573acc348649e767ca67a1ec189fe4e0fcda (patch) | |
| tree | b34f7d2914cba8aeb9311c5bae3771af40054640 /nuttx/sched/pthread_mutextrylock.c | |
| parent | d76fa866ad009d65396acf1aa08fcffd3b4b041e (diff) | |
| download | px4-nuttx-e135573acc348649e767ca67a1ec189fe4e0fcda.tar.gz px4-nuttx-e135573acc348649e767ca67a1ec189fe4e0fcda.tar.bz2 px4-nuttx-e135573acc348649e767ca67a1ec189fe4e0fcda.zip | |
Fix STM32 F2/F4 SDIO clocking; Clean-up files in sched/ directory
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4940 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/pthread_mutextrylock.c')
| -rw-r--r-- | nuttx/sched/pthread_mutextrylock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/sched/pthread_mutextrylock.c b/nuttx/sched/pthread_mutextrylock.c index 24779cbf7..d88012b51 100644 --- a/nuttx/sched/pthread_mutextrylock.c +++ b/nuttx/sched/pthread_mutextrylock.c @@ -2,7 +2,7 @@ * sched/pthread_mutextrylock.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -45,6 +45,7 @@ #include <sched.h> #include <errno.h> #include <debug.h> + #include "pthread_internal.h" /**************************************************************************** @@ -72,7 +73,7 @@ ****************************************************************************/ /**************************************************************************** - * Function: pthread_mutex_trylock + * Name: pthread_mutex_trylock * * Description: * The function pthread_mutex_trylock() is identical to pthread_mutex_lock() @@ -126,7 +127,7 @@ int pthread_mutex_trylock(FAR pthread_mutex_t *mutex) /* Was it not available? */ - else if (*get_errno_ptr() == EAGAIN) + else if (get_errno() == EAGAIN) { ret = EBUSY; } |