evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm_vidc: Clear pendingq when releasing buffers"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-07 02:08:06 -08:00 • committed by Gerrit - the friendly Code Review server
commit 6260ba37fc
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/platform/msm/vidc/msm_vidc.c
View file

@ -720,6 +720,7 @@ int msm_vidc_release_buffers(void *instance, int buffer_type)
struct buffer_info *bi, *dummy; struct buffer_info *bi, *dummy;
struct v4l2_buffer buffer_info; struct v4l2_buffer buffer_info;
struct v4l2_plane plane[VIDEO_MAX_PLANES]; struct v4l2_plane plane[VIDEO_MAX_PLANES];
struct vb2_buf_entry *temp, *next;
int i, rc = 0; int i, rc = 0;
if (!inst) if (!inst)
@ -807,6 +808,15 @@ free_and_unmap:
} }
} }
mutex_unlock(&inst->registeredbufs.lock); mutex_unlock(&inst->registeredbufs.lock);
mutex_lock(&inst->pendingq.lock);
list_for_each_entry_safe(temp, next, &inst->pendingq.list, list) {
if (temp->vb->type == buffer_type) {
list_del(&temp->list);
kfree(temp);
}
}
mutex_unlock(&inst->pendingq.lock);
return rc; return rc;
} }
EXPORT_SYMBOL(msm_vidc_release_buffers); EXPORT_SYMBOL(msm_vidc_release_buffers);