diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-19 17:04:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 17:04:44 -0800 |
| commit | 9eaded2a992807bb4fa724b7b7a5ecb7f5e0cb17 (patch) | |
| tree | 239be3741c43b1246609f4d3154a287b52ca2eca | |
| parent | 313f26f6205f16fe95fdd3ac86f15301e2788b91 (diff) | |
| parent | 28b53604a0490f50f62d654a24a87e0552bf8739 (diff) | |
Merge "msm: vidc: fix issue when video session opening failed"
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_vidc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c index 28faa1436ef5..8b1329db1742 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc.c +++ b/drivers/media/platform/msm/vidc/msm_vidc.c @@ -1243,14 +1243,13 @@ void *msm_vidc_open(int core_id, int session_type) return inst; fail_init: - v4l2_fh_del(&inst->event_handler); - v4l2_fh_exit(&inst->event_handler); - vb2_queue_release(&inst->bufq[OUTPUT_PORT].vb2_bufq); - mutex_lock(&core->lock); list_del(&inst->list); mutex_unlock(&core->lock); + v4l2_fh_del(&inst->event_handler); + v4l2_fh_exit(&inst->event_handler); + vb2_queue_release(&inst->bufq[OUTPUT_PORT].vb2_bufq); fail_bufq_output: vb2_queue_release(&inst->bufq[CAPTURE_PORT].vb2_bufq); fail_bufq_capture: |