diff options
| author | Stanimir Varbanov <stanimir.varbanov@linaro.org> | 2016-08-16 06:09:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-08-24 17:09:38 -0300 |
| commit | 15d6e91a2a77c7552e90b34925b210590244d4cb (patch) | |
| tree | 9698f30694fcf3897548fef24a01b73567d29962 /drivers/media/v4l2-core | |
| parent | 708c05b8faf6ac82808bc416902ca23770190ee1 (diff) | |
| download | talos-obmc-linux-15d6e91a2a77c7552e90b34925b210590244d4cb.tar.gz talos-obmc-linux-15d6e91a2a77c7552e90b34925b210590244d4cb.zip | |
[media] media: v4l2-ctrls: append missing h264 profile string
This appends missing "Stereo High" h264 profile string. Without
it the v4l2 compliance would crash kernel with NULL pointer
dereference at:
[ 26.882278] [<ffff000008685cbc>] std_validate+0x378/0x42c
[ 26.886967] [<ffff000008687424>] set_ctrl+0x8c/0x134
[ 26.892521] [<ffff00000868755c>] v4l2_s_ctrl+0x90/0xf4
[ 26.897555] [<ffff00000867f3b0>] v4l_s_ctrl+0x4c/0x110
[ 26.902503] [<ffff00000867db04>] __video_do_ioctl+0x240/0x2b4
[ 26.907625] [<ffff00000867d778>] video_usercopy+0x33c/0x46c
[ 26.913441] [<ffff00000867d8bc>] video_ioctl2+0x14/0x1c
[ 26.918822] [<ffff000008678878>] v4l2_ioctl+0xe0/0x110
[ 26.924032] [<ffff0000081da898>] do_vfs_ioctl+0xb4/0x764
[ 26.929238] [<ffff0000081dafcc>] SyS_ioctl+0x84/0x98
[ 26.934707] [<ffff000008082f4c>] __sys_trace_return+0x0/0x4
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/v4l2-core')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ctrls.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index f7abfad9ad23..adc2147fcff7 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -361,6 +361,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) "Scalable Baseline", "Scalable High", "Scalable High Intra", + "Stereo High", "Multiview High", NULL, }; |
