Skip to content

Commit

Permalink
media: v4l2-compat-ioctl32.c: don't copy back the result for certain …
Browse files Browse the repository at this point in the history
…errors

commit d83a824 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: Ben Hutchings <ben@decadent.org.uk>
  • Loading branch information
Hans Verkuil authored and Ben Hutchings committed Mar 3, 2018
1 parent 3b764d6 commit 8c04a4f
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/media/v4l2-core/v4l2-compat-ioctl32.c
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,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. */
Expand Down

0 comments on commit 8c04a4f

Please sign in to comment.