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

Commit 1f16f045 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: Fix KW errors."

parents 07635426 407129a8

drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c

+6 −0
Original line number Diff line number Diff line
@@ -764,6 +764,12 @@ static int cam_smmu_map_buffer_and_add_to_list(int idx, int ion_fd, 
	struct dma_buf_attachment *attach = NULL;

	struct sg_table *table = NULL;



	if (!paddr_ptr) {

		pr_err("Error: Input pointer invalid\n");

		rc = -EINVAL;

		goto err_out;

	}



	/* allocate memory for each buffer information */

	buf = dma_buf_get(ion_fd);

	if (IS_ERR_OR_NULL(buf)) {

drivers/media/platform/msm/camera_v2/fd/msm_fd_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static long msm_fd_private_ioctl(struct file *file, void *fh, 
	struct fd_ctx *ctx = msm_fd_ctx_from_fh(fh);

	struct msm_fd_stats *stats;

	int stats_idx;

	int ret;

	int ret = -EINVAL;

	int i;



	switch (cmd) {

drivers/media/platform/msm/camera_v2/fd/msm_fd_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ void msm_fd_hw_put(struct msm_fd_device *fd) 
 */

static int msm_fd_hw_attach_iommu(struct msm_fd_device *fd)

{

	int ret;

	int ret = -EINVAL;



	mutex_lock(&fd->lock);

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

+1 −0
Original line number Diff line number Diff line
@@ -681,6 +681,7 @@ static long msm_private_ioctl(struct file *file, void *fh, 
	unsigned long spin_flags = 0;

	struct msm_sd_subdev *msm_sd;



	memset(&event, 0, sizeof(struct v4l2_event));

	session_id = event_data->session_id;

	stream_id = event_data->stream_id;