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

Commit 60870433 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: remove/update debug messages" into msm-4.9

parents aa4a7d9e 76ee2499

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ int cam_sensor_apply_settings(struct cam_sensor_ctrl_t *s_ctrl, 
						del_req_id, rc);

			}

		} else {

			pr_err("%s:%d Invalid/NOP request to apply: %lld\n",

			CDBG("%s:%d Invalid/NOP request to apply: %lld\n",

				__func__, __LINE__, req_id);

		}

	}

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor_io/cam_sensor_cci_i2c.c

+2 −4
Original line number Diff line number Diff line
@@ -146,11 +146,9 @@ int32_t cam_cci_i2c_poll(struct cam_sensor_cci_client *client, 
	for (i = 0; i < delay_ms; i++) {

		rc = cam_cci_i2c_compare(client,

			addr, data, data_mask, data_type, addr_type);

		if (!rc) {

			pr_err("%s:%d Fail in comparing the data in poll\n",

				__func__, __LINE__);

		if (!rc)

			return rc;

		}



		usleep_range(1000, 1010);

	}