diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2020-04-22 13:14:21 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-04-22 13:28:51 +0200 |
| commit | 19ce44f027ca6ed8c33b3a95a6c26c03d6a04448 (patch) | |
| tree | 2c105fa46af6b91d76725105d45b1add7b51f7fd /drivers/staging/media/rkisp1/rkisp1-isp.c | |
| parent | 33fc918ab89bec747e45e4ffcb2803d37f01dd4d (diff) | |
| download | linux-19ce44f027ca6ed8c33b3a95a6c26c03d6a04448.tar.bz2 | |
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 <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/rkisp1/rkisp1-isp.c')
| -rw-r--r-- | drivers/staging/media/rkisp1/rkisp1-isp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c index 61f159e59d07..dc2b59a0160a 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; |