2 files changed, 18 insertions, 6 deletions

diff --git a/drivers/staging/dream/camera/msm_v4l2.c b/drivers/staging/dream/camera/msm_v4l2.c
index 46a6eb1cf53f..6a7d46cf11eb 100644
--- a/drivers/staging/dream/camera/msm_v4l2.c
+++ b/drivers/staging/dream/camera/msm_v4l2.c
@@ -521,13 +521,17 @@ static int msm_v4l2_s_fmt_cap(struct file *f,
   ctrlcmd->value      = pfmt;
   ctrlcmd->timeout_ms = 10000;
 
-        if (pfmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (pfmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+                kfree(ctrlcmd);
                 return -1;
+        }
 
 #if 0
         /* FIXEME */
-        if (pfmt->fmt.pix.pixelformat != V4L2_PIX_FMT_YVU420)
+        if (pfmt->fmt.pix.pixelformat != V4L2_PIX_FMT_YVU420) {
+                kfree(ctrlcmd);
                 return -EINVAL;
+        }
 #endif
 
         /* Ok, but check other params, too. */
diff --git a/drivers/staging/dream/camera/msm_vfe8x_proc.c b/drivers/staging/dream/camera/msm_vfe8x_proc.c
index 5436f7120018..10aef0e59bab 100644
--- a/drivers/staging/dream/camera/msm_vfe8x_proc.c
+++ b/drivers/staging/dream/camera/msm_vfe8x_proc.c
@@ -967,8 +967,10 @@ vfe_send_af_stats_msg(uint32_t afBufAddress)
         /* fill message with right content. */
         /* @todo This is causing issues, need further investigate */
         /* spin_lock_irqsave(&ctrl->state_lock, flags); */
-        if (ctrl->vstate != VFE_STATE_ACTIVE)
+        if (ctrl->vstate != VFE_STATE_ACTIVE) {
+                kfree(msg);
                 goto af_stats_done;
+        }
 
         msg->_d = VFE_MSG_ID_STATS_AUTOFOCUS;
         msg->_u.msgStatsAf.afBuffer = afBufAddress;
@@ -1053,8 +1055,10 @@ static void vfe_send_awb_stats_msg(uint32_t awbBufAddress)
         /* fill message with right content. */
         /* @todo This is causing issues, need further investigate */
         /* spin_lock_irqsave(&ctrl->state_lock, flags); */
-        if (ctrl->vstate != VFE_STATE_ACTIVE)
+        if (ctrl->vstate != VFE_STATE_ACTIVE) {
+                kfree(msg);
                 goto awb_stats_done;
+        }
 
         msg->_d = VFE_MSG_ID_STATS_WB_EXP;
         msg->_u.msgStatsWbExp.awbBuffer = awbBufAddress;
@@ -1483,8 +1487,10 @@ static void vfe_send_output2_msg(
         /* fill message with right content. */
         /* @todo This is causing issues, need further investigate */
         /* spin_lock_irqsave(&ctrl->state_lock, flags); */
-        if (ctrl->vstate != VFE_STATE_ACTIVE)
+        if (ctrl->vstate != VFE_STATE_ACTIVE) {
+                kfree(msg);
                 goto output2_msg_done;
+        }
 
         msg->_d = VFE_MSG_ID_OUTPUT2;
 
@@ -1518,8 +1524,10 @@ static void vfe_send_output1_msg(
 
         /* @todo This is causing issues, need further investigate */
         /* spin_lock_irqsave(&ctrl->state_lock, flags); */
-        if (ctrl->vstate != VFE_STATE_ACTIVE)
+        if (ctrl->vstate != VFE_STATE_ACTIVE) {
+                kfree(msg);
                 goto output1_msg_done;
+        }
 
         msg->_d = VFE_MSG_ID_OUTPUT1;
         memmove(&(msg->_u),