Merge "msm: kgsl: Correctly clean up dma buffer attachment in case of error" (45d0ff31) · Commits · e / devices / android_kernel_sony_msm8998

drivers/gpu/msm/kgsl.c

+3 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2008-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2008-2020, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -2486,7 +2486,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;
		}
		@@ -2795,7 +2795,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;