Commit f00a1572 authored by Sakari Ailus's avatar Sakari Ailus Committed by Hans Verkuil
Browse files

media: ccs: Obtain media bus formats before initialising up sub-devices 



The available mbus codes will soon be needed earlier, at the time
sub-devices are initialisaed. This is due to calling init_cfg() op via the
v4l2_subdev_init_finalize().

Move ccs_get_mbus_formats() before ccs_init_subdev() calls.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 77ab9dc8

drivers/media/i2c/ccs/ccs-core.c

+6 −6
Original line number Diff line number Diff line
@@ -3553,6 +3553,12 @@ static int ccs_probe(struct i2c_client *client) 
	sensor->pll.ext_clk_freq_hz = sensor->hwcfg.ext_clk;

	sensor->pll.scale_n = CCS_LIM(sensor, SCALER_N_MIN);



	rval = ccs_get_mbus_formats(sensor);

	if (rval) {

		rval = -ENODEV;

		goto out_cleanup;

	}



	rval = ccs_init_subdev(sensor, sensor->scaler, " scaler", 2,

			       MEDIA_ENT_F_PROC_VIDEO_SCALER);

	if (rval)
@@ -3574,12 +3580,6 @@ static int ccs_probe(struct i2c_client *client) 
	if (rval)

		goto out_cleanup;



	rval = ccs_get_mbus_formats(sensor);

	if (rval) {

		rval = -ENODEV;

		goto out_cleanup;

	}



	rval = ccs_init_late_controls(sensor);

	if (rval) {

		rval = -ENODEV;