media: v4l2-subdev: Fix stream handling for crop API

When support for streams was added to the V4L2 subdev API, the
v4l2_subdev_crop structure was extended with a stream field, but the
field was not handled in the core code that translates the
VIDIOC_SUBDEV_[GS]_CROP ioctls to the selection API. Fix it.

Fixes: 2f91e10ee6fd ("media: subdev: add stream based configuration")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 6572667fd5c4ca496810b879cf86a04ec81efcd5..0f590c9dc6caa0bb396c5b28e3dd120a6db471cc 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -765,6 +765,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg,
                memset(&sel, 0, sizeof(sel));
                sel.which = crop->which;
                sel.pad = crop->pad;
+               sel.stream = crop->stream;
                sel.target = V4L2_SEL_TGT_CROP;
 
                rval = v4l2_subdev_call(
@@ -789,6 +790,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg,
                memset(&sel, 0, sizeof(sel));
                sel.which = crop->which;
                sel.pad = crop->pad;
+               sel.stream = crop->stream;
                sel.target = V4L2_SEL_TGT_CROP;
                sel.r = crop->rect;