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

Commit 8136c76d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Add (non-fatal) in logs if it fails."

parents 8335ad66 84bda811

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int32_t msm_sensor_driver_cmd(struct msm_sensor_init_t *s_init, 
			cfg->entity_name);

		mutex_unlock(&s_init->imutex);

		if (rc < 0)

			pr_err("failed: msm_sensor_driver_probe rc %d", rc);

			pr_err("%s failed (non-fatal) rc %d", __func__, rc);

		break;



	case CFG_SINIT_PROBE_DONE:
@@ -142,7 +142,7 @@ static long msm_sensor_init_subdev_do_ioctl( 
		cmd = VIDIOC_MSM_SENSOR_INIT_CFG;

		rc = msm_sensor_init_subdev_ioctl(sd, cmd, &sensor_init_data);

		if (rc < 0) {

			pr_err("%s:%d VIDIOC_MSM_SENSOR_INIT_CFG failed",

			pr_err("%s:%d VIDIOC_MSM_SENSOR_INIT_CFG failed (non-fatal)",

				__func__, __LINE__);

			return rc;

		}