diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-23 15:23:10 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-23 15:23:10 +0100 |
| commit | ee9e35f6bee2c717717c56c78b01441a1d80c12b (patch) | |
| tree | 054aab481eb1fe350414066d024503f3a7bccafe | |
| parent | 3d8171f6ea88297d8595525c8222d61e9cf20fd0 (diff) | |
| parent | e4c914e261d2647e44d05222afa7aa3cc90d3c67 (diff) | |
| download | px4-nuttx-ros.tar.gz px4-nuttx-ros.tar.bz2 px4-nuttx-ros.zip | |
Merge branch 'master' of github.com:PX4/NuttX into rosros
| -rw-r--r-- | nuttx/arch/arm/src/armv7-m/up_initialstate.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/pipes/pipe.c | 5 | ||||
| -rw-r--r-- | nuttx/drivers/usbdev/cdcacm.c | 8 | ||||
| -rw-r--r-- | nuttx/mm/mm_granalloc.c | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/nuttx/arch/arm/src/armv7-m/up_initialstate.c b/nuttx/arch/arm/src/armv7-m/up_initialstate.c index 04089f8ac..8bcf3b442 100644 --- a/nuttx/arch/arm/src/armv7-m/up_initialstate.c +++ b/nuttx/arch/arm/src/armv7-m/up_initialstate.c @@ -97,11 +97,11 @@ void up_initial_state(struct tcb_s *tcb) /* Set the stack limit value */ xcp->regs[REG_R10] = (uint32_t)tcb->stack_alloc_ptr + 64; +#endif /* Fill the stack with a watermark value */ memset(tcb->stack_alloc_ptr, 0xff, tcb->adj_stack_size); -#endif /* Save the task entry point (stripping off the thumb bit) */ diff --git a/nuttx/drivers/pipes/pipe.c b/nuttx/drivers/pipes/pipe.c index 20c160475..86cdeba84 100644 --- a/nuttx/drivers/pipes/pipe.c +++ b/nuttx/drivers/pipes/pipe.c @@ -275,7 +275,10 @@ errout_with_wrfd: errout_with_driver: unregister_driver(devname); errout_with_dev: - pipecommon_freedev(dev); + if (dev) + { + pipecommon_freedev(dev); + } errout_with_pipe: pipe_free(pipeno); errout: diff --git a/nuttx/drivers/usbdev/cdcacm.c b/nuttx/drivers/usbdev/cdcacm.c index 2584ce428..d3ddb8e4d 100644 --- a/nuttx/drivers/usbdev/cdcacm.c +++ b/nuttx/drivers/usbdev/cdcacm.c @@ -1181,12 +1181,12 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver, } DEBUGASSERT(priv->nwrq == 0); irqrestore(flags); - } - /* Clear out all data in the circular buffer */ + /* Clear out all data in the circular buffer */ - priv->serdev.xmit.head = 0; - priv->serdev.xmit.tail = 0; + priv->serdev.xmit.head = 0; + priv->serdev.xmit.tail = 0; + } } /**************************************************************************** diff --git a/nuttx/mm/mm_granalloc.c b/nuttx/mm/mm_granalloc.c index e95709b31..df6bde805 100644 --- a/nuttx/mm/mm_granalloc.c +++ b/nuttx/mm/mm_granalloc.c @@ -313,9 +313,10 @@ static inline FAR void *gran_common_alloc(FAR struct gran_s *priv, size_t size) bitidx += shift; } } + + gran_leave_critical(priv); } - gran_leave_critical(priv); return NULL; } |