Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'component_bt/osi_fixed_queue_v3.3' into 'release/v3.3'

Browse source 
component_bt/: Fix_pointer_type_fixed_queue v3.3

See merge request espressif/esp-idf!6847
This commit is contained in:
Jiang Jiang Jian 2019-12-16 11:31:24 +08:00
parent a980a1780a 97b43b4054
commit 7b73cf613c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/bt/bluedroid/osi/fixed_queue.c
View file

@ -189,7 +189,7 @@ void *fixed_queue_try_dequeue(fixed_queue_t *queue)
return NULL;
}
if (osi_sem_take(queue->dequeue_sem, 0) != 0) {
if (osi_sem_take(&queue->dequeue_sem, 0) != 0) {
return NULL;
}
@ -243,14 +243,14 @@ void *fixed_queue_try_remove_from_queue(fixed_queue_t *queue, void *data)
osi_mutex_lock(&queue->lock, OSI_MUTEX_MAX_TIMEOUT);
if (list_contains(queue->list, data) &&
osi_sem_take(queue->dequeue_sem, 0) == 0) {
osi_sem_take(&queue->dequeue_sem, 0) == 0) {
removed = list_remove(queue->list, data);
assert(removed);
}
osi_mutex_unlock(&queue->lock);
if (removed) {
osi_sem_give(queue->enqueue_sem);
osi_sem_give(&queue->enqueue_sem);
return data;
}