| From b95d3d4b80132d67e1c17daa51157c6de38c7381 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 5 Jan 2021 15:21:11 +0100 |
| Subject: media: ccs: Fix sub-device function |
| |
| From: Sakari Ailus <sakari.ailus@linux.intel.com> |
| |
| [ Upstream commit 8c43126e8c9f0990fa75fb5219c03b20d5ead7b7 ] |
| |
| Fix sub-device function for the pixel array and the scaler. |
| |
| It seems that the pixel array had gotten assigned as SCALER whereas the |
| scaler had CAM_SENSOR function. Fix this by setting the pixel array |
| function to CAM_SENSOR and that of scaler to SCALER. |
| |
| Fixes: 9ec2ac9bd0f9 ("media: ccs: Give all subdevs a function") |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/i2c/ccs/ccs-core.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c |
| index b39ae5f8446b..6a02d8852398 100644 |
| --- a/drivers/media/i2c/ccs/ccs-core.c |
| +++ b/drivers/media/i2c/ccs/ccs-core.c |
| @@ -3290,11 +3290,11 @@ static int ccs_probe(struct i2c_client *client) |
| sensor->pll.scale_n = CCS_LIM(sensor, SCALER_N_MIN); |
| |
| ccs_create_subdev(sensor, sensor->scaler, " scaler", 2, |
| - MEDIA_ENT_F_CAM_SENSOR); |
| + MEDIA_ENT_F_PROC_VIDEO_SCALER); |
| ccs_create_subdev(sensor, sensor->binner, " binner", 2, |
| MEDIA_ENT_F_PROC_VIDEO_SCALER); |
| ccs_create_subdev(sensor, sensor->pixel_array, " pixel_array", 1, |
| - MEDIA_ENT_F_PROC_VIDEO_SCALER); |
| + MEDIA_ENT_F_CAM_SENSOR); |
| |
| rval = ccs_init_controls(sensor); |
| if (rval < 0) |
| -- |
| 2.30.2 |
| |
