From c4982324332f5d36cd77156bb3989425709a8e0f Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Fri, 11 Sep 2009 18:22:27 +0200 Subject: [PATCH] --- yaml --- r: 162566 b: refs/heads/master c: 2bb6a12a88aeac9bab4ed0cf0da1edc03f5eb686 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/dream/camera/msm_v4l2.c | 8 ++++++-- .../staging/dream/camera/msm_vfe8x_proc.c | 16 ++++++++++++---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 982b1ed362e6..cf32127d2dbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2279ae5b58edb7cbe2196d08572fcf59f292354 +refs/heads/master: 2bb6a12a88aeac9bab4ed0cf0da1edc03f5eb686 diff --git a/trunk/drivers/staging/dream/camera/msm_v4l2.c b/trunk/drivers/staging/dream/camera/msm_v4l2.c index 46a6eb1cf53f..6a7d46cf11eb 100644 --- a/trunk/drivers/staging/dream/camera/msm_v4l2.c +++ b/trunk/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/trunk/drivers/staging/dream/camera/msm_vfe8x_proc.c b/trunk/drivers/staging/dream/camera/msm_vfe8x_proc.c index 5436f7120018..10aef0e59bab 100644 --- a/trunk/drivers/staging/dream/camera/msm_vfe8x_proc.c +++ b/trunk/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),