media: venus: introduce core selection
Hello Aniket Masule,
The patch 4ebf969375bc: "media: venus: introduce core selection" from Dec 2, 2019, leads to the following static checker warning:
drivers/media/platform/qcom/venus/vdec.c:968 vdec_start_streaming() warn: inconsistent returns 'inst->lock'.
drivers/media/platform/qcom/venus/vdec.c
943 static int vdec_start_streaming(struct vb2_queue *q, unsigned int count) 944 {
945 struct venus_inst *inst = vb2_get_drv_priv(q);
946 int ret;
947
948 mutex_lock(&inst->lock);
949
950 ret = venus_pm_acquire_core(inst);
951 if (ret)
952 return ret;
goto error or just goto unlock?
953 954 if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) 955 ret = vdec_start_capture(inst); 956 else 957 ret = vdec_start_output(inst); 958 959 if (ret) 960 goto error; 961 962 mutex_unlock(&inst->lock); 963 return 0; 964 965 error: 966 venus_helper_buffers_done(inst, VB2_BUF_STATE_QUEUED); 967 mutex_unlock(&inst->lock); 968 return ret; 969 }
regards,
dan carpenter
Hi Dan,
Thanks! The fix is on its way already [1].
Quoted 43 lines · Dan Carpenter
Hello Aniket Masule,
The patch
4ebf969375bc: "media: venus: introduce core selection" from Dec 2, 2019, leads to the following static checker warning:drivers/media/platform/qcom/venus/vdec.c:968 vdec_start_streaming() warn: inconsistent returns 'inst->lock'.
drivers/media/platform/qcom/venus/vdec.c
943 static intvdec_start_streaming(struct vb2_queue *q, unsigned int count)944 { 945 struct venus_inst *inst = vb2_get_drv_priv(q); 946 int ret; 947 948 mutex_lock(&inst->lock); 949 950 ret = venus_pm_acquire_core(inst); 951 if (ret) 952 return ret;goto error or just goto unlock?
953 954 if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) 955 ret = vdec_start_capture(inst); 956 else 957 ret = vdec_start_output(inst); 958 959 if (ret) 960 goto error; 961 962 mutex_unlock(&inst->lock); 963 return 0; 964 965 error: 966 venus_helper_buffers_done(inst, VB2_BUF_STATE_QUEUED); 967 mutex_unlock(&inst->lock); 968 return ret; 969 }regards,
dan carpenter
Signature · 4 lines
regards, Stan [1] https://www.spinics.net/lists/linux-media/msg164934.html