drm/etnaviv: fix etnaviv_cmdbuf_suballoc_new return value (c53ab613) · Commits · 戴 / test

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> Reviewed-by:

Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by:

Guido Günther <agx@sigxcpu.org>

drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,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,
		@@ -65,7 +67,7 @@ free_dma:
		free_suballoc:
		kfree(suballoc);

		return NULL;
		return ERR_PTR(ret);
		}

		void etnaviv_cmdbuf_suballoc_destroy(struct etnaviv_cmdbuf_suballoc *suballoc)

Admin message