Merge remote-tracking branch 'origin/master' into ipv6

ChangeLog

@@ -9466,7 +9466,9 @@
 	  from the worker thread, it is necessary to have the stack locked
 	  (2015-01-18).
 	* nuttx/arch/arm/src/stm32/stm32_serial.c: fix declaration and
-          definition of up_receive() and up_dma_receive() to match fields of
+	definition of up_receive() and up_dma_receive() to match fields of
 	  uart_ops_s from nuttx/include/nuttx/serial/serial.h.  From Freddie
 	  Chopin (2015-01-19).
-
+	* drivers/pipes/pipe.c, drivers/usbdev/cdcacm.c, and
+	  mm/mm_gran/mm_granalloc.c: Fixes some issues found by the PX4 team
+	  using Coverity.  From Pavel Krienko (2015-01-19).

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:

drivers/usbdev/cdcacm.c

@@ -1205,14 +1205,15 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver,
               priv->nwrq--;     /* Number of write requests queued */
             }
         }
+
       DEBUGASSERT(priv->nwrq == 0);
       irqrestore(flags);
+
+      /* Clear out all data in the circular buffer */
+
+      priv->serdev.xmit.head = 0;
+      priv->serdev.xmit.tail = 0;
     }
-
-  /* Clear out all data in the circular buffer */
-
-  priv->serdev.xmit.head = 0;
-  priv->serdev.xmit.tail = 0;
 }
 
 /****************************************************************************

mm/mm_gran/mm_granalloc.c

@@ -245,9 +245,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;
 }