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

Browse source

Commit 5964cbd869 ("imx: Set capture compose rectangle in
capture_device_set_format") broke the compilation of commit
05f634040c ("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>

...

This commit is contained in:

Hans Verkuil 2019-02-19 02:38:22 -05:00 • committed by Mauro Carvalho Chehab

parent b3c786566d

commit 2758d9a77f

1 changed files with 3 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/staging/media/imx/imx7-media-csi.c

View file