diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-28 11:35:14 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-28 11:35:14 -0600 |
| commit | 847af22cb8a8eae0636110b475af6b78eaf49a06 (patch) | |
| tree | 934baf3382893af72fba462135373b903d9b4e77 /nuttx/sched | |
| parent | 3fff2e322e57f03d4bab2b33d49cfb02f245c654 (diff) | |
| download | px4-nuttx-847af22cb8a8eae0636110b475af6b78eaf49a06.tar.gz px4-nuttx-847af22cb8a8eae0636110b475af6b78eaf49a06.tar.bz2 px4-nuttx-847af22cb8a8eae0636110b475af6b78eaf49a06.zip | |
NET: Fix some errors in recent network I/O buffering when stack runs from interrupt level
Diffstat (limited to 'nuttx/sched')
| -rw-r--r-- | nuttx/sched/os_start.c | 7 | ||||
| -rw-r--r-- | nuttx/sched/sem_trywait.c | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/nuttx/sched/os_start.c b/nuttx/sched/os_start.c index a7cd4b9f4..194b42ab2 100644 --- a/nuttx/sched/os_start.c +++ b/nuttx/sched/os_start.c @@ -448,12 +448,7 @@ void os_start(void) /* Initialize the network system */ #ifdef CONFIG_NET -#if 0 - if (net_initialize != NULL) -#endif - { - net_initialize(); - } + net_initialize(); #endif /* The processor specific details of running the operating system diff --git a/nuttx/sched/sem_trywait.c b/nuttx/sched/sem_trywait.c index ce3e80b3a..38de330a5 100644 --- a/nuttx/sched/sem_trywait.c +++ b/nuttx/sched/sem_trywait.c @@ -116,8 +116,8 @@ int sem_trywait(FAR sem_t *sem) saved_state = irqsave(); - /* Any further errors could only be occurred because the semaphore - * is not available. + /* Any further errors could only occurr because the semaphore is not + * available. */ set_errno(EAGAIN); |