Merge "msm: camera: Fix improper ion free in error case" (e7289bf5) · Commits · e / devices / android_kernel_sony_msm8994

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -282,10 +282,8 @@ static unsigned long msm_cpp_queue_buffer_info(struct cpp_device *cpp_dev,
		return buff->map_info.phy_addr;

		QUEUE_BUFF_ERROR2:
		ion_unmap_iommu(cpp_dev->client, buff->map_info.ion_handle,
		cpp_dev->domain_num, 0);
		QUEUE_BUFF_ERROR1:
		ion_free(cpp_dev->client, buff->map_info.ion_handle);
		QUEUE_BUFF_ERROR1:
		buff->map_info.ion_handle = NULL;
		kzfree(buff);