Home Home > GIT Browse
diff options
authorHans Verkuil <hans.verkuil@cisco.com>2018-02-14 12:54:18 +0100
committerSasha Levin <alexander.levin@microsoft.com>2018-03-04 10:28:48 -0500
commit77a6ac91c1fd375e45e642f199a4cd434c493905 (patch)
parent60e5b2805609e833f6e4e58210198f1ba1081bf6 (diff)
media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors
commit d83a8243aaefe62ace433e4384a4f077bed86acb upstream. Some ioctls need to copy back the result even if the ioctl returned an error. However, don't do this for the error code -ENOTTY. It makes no sense in that cases. 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: Sasha Levin <alexander.levin@microsoft.com>
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index 8371bbbda383..3e1d3ed3561c 100644
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -946,6 +946,9 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar
+ if (err == -ENOTTY)
+ return err;
/* Special case: even after an error we need to put the
results back for these ioctls since the error_idx will
contain information on which control failed. */