From: Hans Verkuil Date: Wed, 22 Apr 2020 11:14:21 +0000 (+0200) Subject: media: rkisp1: fix missing mbus.type -> mbus_type conversion X-Git-Tag: v5.8-rc1~162^2~231 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19ce44f027ca6ed8c33b3a95a6c26c03d6a04448;p=thirdparty%2Fkernel%2Flinux.git media: rkisp1: fix missing mbus.type -> mbus_type conversion There was one missing sensor->mbus.type to sensor->mbus_type conversion which broke the build. I suspect this was due to a merge conflict that was incorrectly resolved. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c index 61f159e59d07a..dc2b59a0160a8 100644 --- a/drivers/staging/media/rkisp1/rkisp1-isp.c +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c @@ -291,7 +291,7 @@ static int rkisp1_config_isp(struct rkisp1_device *rkisp1) if (sink_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER) { acq_mult = 1; if (src_fmt->pixel_enc == V4L2_PIXEL_ENC_BAYER) { - if (sensor->mbus.type == V4L2_MBUS_BT656) + if (sensor->mbus_type == V4L2_MBUS_BT656) isp_ctrl = RKISP1_CIF_ISP_CTRL_ISP_MODE_RAW_PICT_ITU656; else isp_ctrl = RKISP1_CIF_ISP_CTRL_ISP_MODE_RAW_PICT;