Commit 231d1a01 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

[media] smiapp: Always initialise the sensor in probe

Initialise the sensor in probe. The reason why it wasn't previously done
in case of platform data was that the probe() of the driver that provided
the clock through the set_xclk() callback would need to finish before the
probe() function of the smiapp driver. The set_xclk() callback no longer
exists.
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 624e9896
......@@ -2530,8 +2530,9 @@ static int smiapp_register_subdev(struct smiapp_sensor *sensor,
return 0;
}
static int smiapp_register_subdevs(struct smiapp_sensor *sensor)
static int smiapp_registered(struct v4l2_subdev *subdev)
{
struct smiapp_sensor *sensor = to_smiapp_sensor(subdev);
int rval;
if (sensor->scaler) {
......@@ -2819,25 +2820,6 @@ static int smiapp_init(struct smiapp_sensor *sensor)
return rval;
}
static int smiapp_registered(struct v4l2_subdev *subdev)
{
struct smiapp_sensor *sensor = to_smiapp_sensor(subdev);
struct i2c_client *client = v4l2_get_subdevdata(subdev);
int rval;
if (!client->dev.of_node) {
rval = smiapp_init(sensor);
if (rval)
return rval;
}
rval = smiapp_register_subdevs(sensor);
if (rval)
smiapp_cleanup(sensor);
return rval;
}
static int smiapp_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
{
struct smiapp_subdev *ssd = to_smiapp_subdev(sd);
......@@ -3079,11 +3061,9 @@ static int smiapp_probe(struct i2c_client *client,
sensor->src->sensor = sensor;
sensor->src->pads[0].flags = MEDIA_PAD_FL_SOURCE;
if (client->dev.of_node) {
rval = smiapp_init(sensor);
if (rval)
goto out_media_entity_cleanup;
}
rval = smiapp_init(sensor);
if (rval)
goto out_media_entity_cleanup;
rval = media_entity_pads_init(&sensor->src->sd.entity, 2,
sensor->src->pads);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment