diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2019-02-19 02:38:22 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-02-19 08:12:46 -0500 |
| commit | 2758d9a77fb41134b9014549d165c20ba9d084c9 (patch) | |
| tree | 75564ba2336197bfe4f7151edf6d4a205f9b51e2 /drivers/staging/media | |
| parent | b3c786566d8f3f69b9f4144c2707db74158caf9a (diff) | |
media: imx7-media-csi.c: fix merge breakage
Commit 5964cbd86922 ("imx: Set capture compose rectangle in
capture_device_set_format") broke the compilation of commit
05f634040c0d ("staging/imx7: add imx7 CSI subdev driver").
These patches came in through different pull requests and
nobody noticed that the first changed functions that the
second relied upon.
Update imx7-media-csi.c accordingly.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Rui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/imx/imx7-media-csi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index c1cf80bcad64..d775e259fece 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -1036,6 +1036,7 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd, const struct imx_media_pixfmt *outcc; struct v4l2_mbus_framefmt *outfmt; struct v4l2_pix_format vdev_fmt; + struct v4l2_rect vdev_compose; const struct imx_media_pixfmt *cc; struct v4l2_mbus_framefmt *fmt; struct v4l2_subdev_format format; @@ -1082,11 +1083,11 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd, csi->cc[sdformat->pad] = cc; /* propagate output pad format to capture device */ - imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, + imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt, &vdev_compose, &csi->format_mbus[IMX7_CSI_PAD_SRC], csi->cc[IMX7_CSI_PAD_SRC]); mutex_unlock(&csi->lock); - imx_media_capture_device_set_format(vdev, &vdev_fmt); + imx_media_capture_device_set_format(vdev, &vdev_fmt, &vdev_compose); return 0; |