Merge branch 'master' of bitbucket.org:nuttx/nuttx

This commit is contained in:
Gregory Nutt 2017-03-10 10:52:48 -06:00
commit 662f520c37
2 changed files with 2 additions and 2 deletions

View File

@ -108,7 +108,7 @@ typedef struct sem_s sem_t;
{(c), 0, NULL} /* semcount, flags, hhead */ {(c), 0, NULL} /* semcount, flags, hhead */
# else # else
# define SEM_INITIALIZER(c) \ # define SEM_INITIALIZER(c) \
{(c), 0, SEMHOLDER_INITIALIZER, SEMHOLDER_INITIALIZER} /* semcount, flags, holder[2] */ {(c), 0, {SEMHOLDER_INITIALIZER, SEMHOLDER_INITIALIZER}} /* semcount, flags, holder[2] */
# endif # endif
#else #else
# define SEM_INITIALIZER(c) \ # define SEM_INITIALIZER(c) \

View File

@ -158,7 +158,7 @@ static FAR struct semholder_s *sem_findholder(sem_t *sem,
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
pholder = &sem->pholder[i]; pholder = &sem->holder[i];
if (pholder->htcb == htcb) if (pholder->htcb == htcb)
{ {
/* Got it! */ /* Got it! */