OSDN Git Service

media: rkisp1: fix missing mbus.type -> mbus_type conversion
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 22 Apr 2020 11:14:21 +0000 (13:14 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 22 Apr 2020 11:28:51 +0000 (13:28 +0200)
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 <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/staging/media/rkisp1/rkisp1-isp.c

index 61f159e..dc2b59a 100644 (file)
@@ -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;