media: v4l: subdev: Copy argument back to user also for S_ROUTING
As the user needs to know what went wrong for S_ROUTING, copy array arguments back to the user. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Reviewed-by: Julien Massot <julien.massot@collabora.com> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
parent
72364b91ce
commit
38c84932de
1 changed files with 6 additions and 3 deletions
|
@ -3461,11 +3461,14 @@ video_usercopy(struct file *file, unsigned int orig_cmd, unsigned long arg,
|
||||||
* FIXME: subdev IOCTLS are partially handled here and partially in
|
* FIXME: subdev IOCTLS are partially handled here and partially in
|
||||||
* v4l2-subdev.c and the 'always_copy' flag can only be set for IOCTLS
|
* v4l2-subdev.c and the 'always_copy' flag can only be set for IOCTLS
|
||||||
* defined here as part of the 'v4l2_ioctls' array. As
|
* defined here as part of the 'v4l2_ioctls' array. As
|
||||||
* VIDIOC_SUBDEV_G_ROUTING needs to return results to applications even
|
* VIDIOC_SUBDEV_[GS]_ROUTING needs to return results to applications
|
||||||
* in case of failure, but it is not defined here as part of the
|
* even in case of failure, but it is not defined here as part of the
|
||||||
* 'v4l2_ioctls' array, insert an ad-hoc check to address that.
|
* 'v4l2_ioctls' array, insert an ad-hoc check to address that.
|
||||||
*/
|
*/
|
||||||
if (err < 0 && !always_copy && cmd != VIDIOC_SUBDEV_G_ROUTING)
|
if (cmd == VIDIOC_SUBDEV_G_ROUTING || cmd == VIDIOC_SUBDEV_S_ROUTING)
|
||||||
|
always_copy = true;
|
||||||
|
|
||||||
|
if (err < 0 && !always_copy)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (has_array_args) {
|
if (has_array_args) {
|
||||||
|
|
Loading…
Reference in a new issue