Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2758d9a7 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: imx7-media-csi.c: fix merge breakage



Commit 5964cbd8 ("imx: Set capture compose rectangle in
capture_device_set_format") broke the compilation of commit
05f63404 ("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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarRui Miguel Silva <rui.silva@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent b3c78656
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment