diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2019-07-04 15:06:04 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2019-07-05 16:46:22 +0200 |
| commit | 3faf7c4bd20d7da913f7122088f729a675aab456 (patch) | |
| tree | 69752c28f3be33cb1d4ef1f7c7f99677317243fa | |
| parent | ddf91b1179c8f6cc185ba46ca86191c8a9f28033 (diff) | |
| download | linux-0-day-3faf7c4bd20d7da913f7122088f729a675aab456.tar.gz linux-0-day-3faf7c4bd20d7da913f7122088f729a675aab456.tar.xz | |
drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value
The call site expects to get either a valid suballoc or an error
pointer, so a NULL return will not be treated as an error. Make
sure to always return a proper error pointer in case something goes
wrong.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c index bb4900bc1c4c7..7b77992f31c4f 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c @@ -48,8 +48,10 @@ etnaviv_cmdbuf_suballoc_new(struct etnaviv_gpu * gpu) suballoc->vaddr = dma_alloc_wc(gpu->dev, SUBALLOC_SIZE, &suballoc->paddr, GFP_KERNEL); - if (!suballoc->vaddr) + if (!suballoc->vaddr) { + ret = -ENOMEM; goto free_suballoc; + } ret = etnaviv_iommu_get_suballoc_va(gpu, suballoc->paddr, &suballoc->vram_node, SUBALLOC_SIZE, @@ -64,7 +66,7 @@ free_dma: free_suballoc: kfree(suballoc); - return NULL; + return ERR_PTR(ret); } void etnaviv_cmdbuf_suballoc_destroy(struct etnaviv_cmdbuf_suballoc *suballoc) |