Commit e78d9fdf authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman

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

commit 181a4a2d upstream.

If the ioctl returned -ENOTTY, then don't bother copying
back the result as there is no point.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent daaa81c4
...@@ -2862,8 +2862,11 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg, ...@@ -2862,8 +2862,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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment