summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPraveen Chavan <pchavan@codeaurora.org>2016-06-16 15:49:59 -0700
committerKyle Yan <kyan@codeaurora.org>2016-07-11 14:27:02 -0700
commitc108070ffaa8700fea674548d37c8a385cf9ec43 (patch)
tree165b0856f08a3a02ee59df887d7a8d9794d1901b
parent50044eb1b4614a2013e64a69df2ddb5e84f0466e (diff)
msm: vidc: update the check to ignore extradata plane in dqbuf
userptr may or may not be a null-value. Checking for this field to qualify a plane as extradata has no merit. Ignore that check. Bug: 28747768 CRs-Fixed: 1026885 Change-Id: I08d85ef462f09003aaa17f6ebc5d27de7083796f Signed-off-by: Praveen Chavan <pchavan@codeaurora.org> Signed-off-by: Praneeth Paladugu <ppaladug@codeaurora.org> Signed-off-by: Amit Shekhar <ashekhar@codeaurora.org>
-rw-r--r--drivers/media/platform/msm/vidc/msm_vidc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c
index 51be8df7ff35..97add87b3ddf 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc.c
@@ -907,8 +907,7 @@ int msm_vidc_dqbuf(void *instance, struct v4l2_buffer *b)
for (i = 0; i < b->length; i++) {
if (EXTRADATA_IDX(b->length) &&
- (i == EXTRADATA_IDX(b->length)) &&
- !b->m.planes[i].m.userptr) {
+ i == EXTRADATA_IDX(b->length)) {
continue;
}
buffer_info = device_to_uvaddr(&inst->registeredbufs,