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

media: v4l2-ioctl.c: don't copy back the result for -ENOTTY

Browse source 
commit 181a4a2d5a0a7b43cab08a70710d727e7764ccdd upstream.

If the ioctl returned -ENOTTY, then don't bother copying
back the result as there is no point.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hans Verkuil 2018-02-14 12:52:27 +01:00 • committed by Greg Kroah-Hartman
parent 49ffe04fcd
commit 15e3780a8a
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/media/v4l2-core/v4l2-ioctl.c
View file

@ -2783,8 +2783,11 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
/* Handles IOCTL */ /* Handles IOCTL */
err = func(file, cmd, parg); err = func(file, cmd, parg);
if (err == -ENOIOCTLCMD) if (err == -ENOTTY || err == -ENOIOCTLCMD) {
err = -ENOTTY; err = -ENOTTY;
goto out;
}
if (err == 0) { if (err == 0) {
if (cmd == VIDIOC_DQBUF) if (cmd == VIDIOC_DQBUF)
trace_v4l2_dqbuf(video_devdata(file)->minor, parg); trace_v4l2_dqbuf(video_devdata(file)->minor, parg);