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

Commit c518b376 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: Change %p into %pK"

parents 91df703c f1964144

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+3 −3
Original line number Diff line number Diff line
@@ -1028,8 +1028,8 @@ static int msm_vfe40_start_fetch_engine(struct vfe_device *vfe_dev, 
		rc = vfe_dev->buf_mgr->ops->get_buf_by_index(

			vfe_dev->buf_mgr, bufq_handle, fe_cfg->buf_idx, &buf);

		if (rc < 0 || !buf) {

			pr_err("%s: No fetch buffer rc= %d buf= %p\n",

				__func__, rc, buf);

			pr_err("%s: No fetch buffer rc= %d\n",

				__func__, rc);

			return -EINVAL;

		}

		mapped_info = buf->mapped_info[0];
@@ -1085,7 +1085,7 @@ static int msm_vfe40_start_fetch_engine_multi_pass(struct vfe_device *vfe_dev, 
		rc = vfe_dev->buf_mgr->ops->get_buf_by_index(

			vfe_dev->buf_mgr, bufq_handle, fe_cfg->buf_idx, &buf);

		if (rc < 0 || !buf) {

			pr_err("%s: No fetch buffer rc= %d buf= %p\n",

			pr_err("%s: No fetch buffer rc= %d buf= %pK\n",

				__func__, rc, buf);

			return -EINVAL;

		}

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+2 −2
Original line number Diff line number Diff line
@@ -1675,8 +1675,8 @@ int msm_isp_cfg_offline_ping_pong_address(struct vfe_device *vfe_dev, 
		rc = vfe_dev->buf_mgr->ops->get_buf_by_index(

			vfe_dev->buf_mgr, bufq_handle, buf_idx, &buf);

		if (rc < 0 || !buf) {

			pr_err("%s: No fetch buffer rc= %d buf= %p\n",

				__func__, rc, buf);

			pr_err("%s: No fetch buffer rc= %d\n",

				__func__, rc);

			return -EINVAL;

		}

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_tz_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ int32_t msm_camera_tz_i2c_register_sensor( 
		return -EINVAL;

	}



	CDBG("id=%d, client=%p\n", s_ctrl->id, s_ctrl);

	CDBG("id=%d, client=%pK\n", s_ctrl->id, s_ctrl);

	sensor_info[s_ctrl->id].s_ctrl = s_ctrl;

	sensor_info[s_ctrl->id].secure = s_ctrl->is_secure;

	return 0;