media: imx7-media-csi.c: fix merge breakage
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Tue, 19 Feb 2019 07:38:22 +0000 (02:38 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Tue, 19 Feb 2019 13:12:46 +0000 (08:12 -0500)
commit2758d9a77fb41134b9014549d165c20ba9d084c9
tree75564ba2336197bfe4f7151edf6d4a205f9b51e2
parentb3c786566d8f3f69b9f4144c2707db74158caf9a
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>
drivers/staging/media/imx/imx7-media-csi.c