diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2018-01-26 11:24:53 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2018-01-30 15:35:16 +0300 |
| commit | d83a8243aaefe62ace433e4384a4f077bed86acb (patch) | |
| tree | 162c02bc879c47ca482d01fbe5a562a58ff94f83 /drivers/media | |
| parent | 169f24ca68bf0f247d111aef07af00dd3a02ae88 (diff) | |
| download | linux-d83a8243aaefe62ace433e4384a4f077bed86acb.tar.xz | |
media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors
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>
Cc: <stable@vger.kernel.org> # for v4.15 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 |
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 7ee3777cbe9c..3a1fca1440ac 100644 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c @@ -968,6 +968,9 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long ar set_fs(old_fs); } + 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. */ |