Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/tegra: gem: Do not return NULL in tegra_bo_mmap()

It's confusing for a function to return NULL and ERR_PTR()-encoded error
codes on failure. Make sure we only ever return the latter since that's
what callers already expect.

Reported-by: Sui Jingfeng <suijingfeng@loongson.cn>
Reviewed-by: Sui Jingfeng <suijingfeng@loongson.cn>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZSVuVcqdGfGtQIQj@orome.fritz.box

+11 -2
+11 -2
drivers/gpu/drm/tegra/gem.c
··· 178 178 { 179 179 struct tegra_bo *obj = host1x_to_tegra_bo(bo); 180 180 struct iosys_map map = { 0 }; 181 + void *vaddr; 181 182 int ret; 182 183 183 184 if (obj->vaddr) ··· 186 185 187 186 if (obj->gem.import_attach) { 188 187 ret = dma_buf_vmap_unlocked(obj->gem.import_attach->dmabuf, &map); 189 - return ret ? NULL : map.vaddr; 188 + if (ret < 0) 189 + return ERR_PTR(ret); 190 + 191 + return map.vaddr; 190 192 } 191 193 192 - return vmap(obj->pages, obj->num_pages, VM_MAP, pgprot_writecombine(PAGE_KERNEL)); 194 + vaddr = vmap(obj->pages, obj->num_pages, VM_MAP, 195 + pgprot_writecombine(PAGE_KERNEL)); 196 + if (!vaddr) 197 + return ERR_PTR(-ENOMEM); 198 + 199 + return vaddr; 193 200 } 194 201 195 202 static void tegra_bo_munmap(struct host1x_bo *bo, void *addr)