summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-21 05:00:27 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-21 05:00:27 -0700
commit2dd84150c79e1fe82f9ff947f5b52f37ce3bbff9 (patch)
tree5c23fff9b0c59e990a603c3dbf0d28517de65263
parent12d7eee021a829626b6b0ec494bbb12d7332a8ee (diff)
parent0e73a64179a0ed156f59086b88b198191405b482 (diff)
Merge "msm vidc: Update flags for secure scaling control"
-rw-r--r--drivers/media/platform/msm/vidc/msm_vdec.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vdec.c b/drivers/media/platform/msm/vidc/msm_vdec.c
index b7e2c297a1ad..24eb8fff905b 100644
--- a/drivers/media/platform/msm/vidc/msm_vdec.c
+++ b/drivers/media/platform/msm/vidc/msm_vdec.c
@@ -528,7 +528,6 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = {
.step = 1,
.menu_skip_mask = 0,
.qmenu = NULL,
- .flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,
},
{
.id = V4L2_CID_MPEG_VIDC_VIDEO_NON_SECURE_OUTPUT2,