Merge "msm: kgsl: Correctly clean up dma buffer attachment in case of error" (431b4c2f) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/msm/kgsl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2807,7 +2807,7 @@ long kgsl_ioctl_gpuobj_import(struct kgsl_device_private *dev_priv,
		return 0;

		unmap:
		if (param->type == KGSL_USER_MEM_TYPE_DMABUF) {
		if (kgsl_memdesc_usermem_type(&entry->memdesc) == KGSL_MEM_ENTRY_ION) {
		kgsl_destroy_ion(entry->priv_data);
		entry->memdesc.sgt = NULL;
		}
		@@ -3121,7 +3121,7 @@ long kgsl_ioctl_map_user_mem(struct kgsl_device_private *dev_priv,
		return result;

		error_attach:
		switch (memtype) {
		switch (kgsl_memdesc_usermem_type(&entry->memdesc)) {
		case KGSL_MEM_ENTRY_ION:
		kgsl_destroy_ion(entry->priv_data);
		entry->memdesc.sgt = NULL;