diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-08-20 01:35:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-08-20 01:35:04 -0700 |
| commit | 45d0ff3112465a5172b4c802ffe021311a5d352b (patch) | |
| tree | 82f48c3c020dc09c879e2a86ca5b1e83d1f29148 | |
| parent | 3ce5f98da0b93a56300378d6ebf3549226ecc5aa (diff) | |
| parent | cbc3abdd7f327200e94ff66bd4b4dad6a2123f3b (diff) | |
Merge "msm: kgsl: Correctly clean up dma buffer attachment in case of error"
| -rw-r--r-- | drivers/gpu/msm/kgsl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index 90d9bd2339eb..44522cac7c42 100644 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -1,4 +1,4 @@ -/* 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; |