Merge "msm: cpp: Return appropriate error on checking physical address" (703d897a) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -447,7 +447,7 @@ static unsigned long msm_cpp_queue_buffer_info(struct cpp_device *cpp_dev,
		list_for_each_entry_safe(buff, save, buff_head, entry) {
		if (buff->map_info.buff_info.index == buffer_info->index) {
		pr_err("error buffer index already queued\n");
		return -EINVAL;
		goto error;
		}
		}

		@@ -455,7 +455,7 @@ static unsigned long msm_cpp_queue_buffer_info(struct cpp_device *cpp_dev,
		sizeof(struct msm_cpp_buffer_map_list_t), GFP_KERNEL);
		if (!buff) {
		pr_err("error allocating memory\n");
		return -EINVAL;
		goto error;
		}
		buff->map_info.buff_info = *buffer_info;

		@@ -466,13 +466,15 @@ static unsigned long msm_cpp_queue_buffer_info(struct cpp_device *cpp_dev,
		if (rc < 0) {
		pr_err("ION mmap failed\n");
		kzfree(buff);
		return rc;
		goto error;
		}

		INIT_LIST_HEAD(&buff->entry);
		list_add_tail(&buff->entry, buff_head);

		return buff->map_info.phy_addr;
		error:
		return 0;
		}

		static void msm_cpp_dequeue_buffer_info(struct cpp_device *cpp_dev,