jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cm3/sync: Fix broken mutex_trylock()

Browse Source 
Fails when the mutex was already locked.

Implemented zyp's fix for broken mutex. If it's 1 (= failure) by default, the function works fine.

irc log for reference
```
<zyp> strex returns 1 if it fails, 0 if it's successful
<zyp> but if the mutex is already locked, line 57 skips the status update and status gets remains at the initial value which means successful, which is wrong
<zyp> changing line 54 to status = 1 should do the trick
```
This commit is contained in:
Ondřej Hruška 2016-01-05 23:20:02 +01:00 committed by Karl Palsson
parent 5996ac606b
commit fb410a403d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cm3/sync.c
View File

@ -51,7 +51,7 @@ void mutex_lock(mutex_t *m)
/* returns 1 if the lock was acquired */ /* returns 1 if the lock was acquired */
uint32_t mutex_trylock(mutex_t *m) uint32_t mutex_trylock(mutex_t *m)
{ {
uint32_t status = 0; uint32_t status = 1;
/* If the mutex is unlocked. */ /* If the mutex is unlocked. */
if (__ldrex(m) == MUTEX_UNLOCKED) { if (__ldrex(m) == MUTEX_UNLOCKED) {