Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98add8e8 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] smiapp: Use 8-bit reads only before identifying the sensor 



Some sensors only allow 8-bit access, so use safe 8-bit access before the
sensor has been identified.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ceb9e30e

drivers/media/video/smiapp/smiapp-core.c

+34 −29
Original line number Diff line number Diff line
@@ -2197,50 +2197,55 @@ static int smiapp_identify_module(struct v4l2_subdev *subdev) 
	minfo->name = SMIAPP_NAME;



	/* Module info */

	rval = smiapp_read(sensor, SMIAPP_REG_U8_MANUFACTURER_ID,

	rval = smiapp_read_8only(sensor, SMIAPP_REG_U8_MANUFACTURER_ID,

				 &minfo->manufacturer_id);

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U16_MODEL_ID,

		rval = smiapp_read_8only(sensor, SMIAPP_REG_U16_MODEL_ID,

					 &minfo->model_id);

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U8_REVISION_NUMBER_MAJOR,

		rval = smiapp_read_8only(sensor,

					 SMIAPP_REG_U8_REVISION_NUMBER_MAJOR,

					 &minfo->revision_number_major);

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U8_REVISION_NUMBER_MINOR,

		rval = smiapp_read_8only(sensor,

					 SMIAPP_REG_U8_REVISION_NUMBER_MINOR,

					 &minfo->revision_number_minor);

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U8_MODULE_DATE_YEAR,

		rval = smiapp_read_8only(sensor,

					 SMIAPP_REG_U8_MODULE_DATE_YEAR,

					 &minfo->module_year);

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U8_MODULE_DATE_MONTH,

		rval = smiapp_read_8only(sensor,

					 SMIAPP_REG_U8_MODULE_DATE_MONTH,

					 &minfo->module_month);

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U8_MODULE_DATE_DAY,

		rval = smiapp_read_8only(sensor, SMIAPP_REG_U8_MODULE_DATE_DAY,

					 &minfo->module_day);



	/* Sensor info */

	if (!rval)

		rval = smiapp_read(sensor,

		rval = smiapp_read_8only(sensor,

					 SMIAPP_REG_U8_SENSOR_MANUFACTURER_ID,

					 &minfo->sensor_manufacturer_id);

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U16_SENSOR_MODEL_ID,

		rval = smiapp_read_8only(sensor,

					 SMIAPP_REG_U16_SENSOR_MODEL_ID,

					 &minfo->sensor_model_id);

	if (!rval)

		rval = smiapp_read(sensor,

		rval = smiapp_read_8only(sensor,

					 SMIAPP_REG_U8_SENSOR_REVISION_NUMBER,

					 &minfo->sensor_revision_number);

	if (!rval)

		rval = smiapp_read(sensor,

		rval = smiapp_read_8only(sensor,

					 SMIAPP_REG_U8_SENSOR_FIRMWARE_VERSION,

					 &minfo->sensor_firmware_version);



	/* SMIA */

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U8_SMIA_VERSION,

		rval = smiapp_read_8only(sensor, SMIAPP_REG_U8_SMIA_VERSION,

					 &minfo->smia_version);

	if (!rval)

		rval = smiapp_read(sensor, SMIAPP_REG_U8_SMIAPP_VERSION,

		rval = smiapp_read_8only(sensor, SMIAPP_REG_U8_SMIAPP_VERSION,

					 &minfo->smiapp_version);



	if (rval) {