Commit 4d22f108 authored by Wei Yongjun's avatar Wei Yongjun Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci: vpbe: fix return value check in vpbe_display_reqbufs() 



In case of error, the function vb2_dma_contig_init_ctx() returns
ERR_PTR() and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarPrabhakar Lad <prabhakar.lad@ti.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cfe9dbd8

drivers/media/platform/davinci/vpbe_display.c

+2 −2
Original line number Diff line number Diff line
@@ -1393,9 +1393,9 @@ static int vpbe_display_reqbufs(struct file *file, void *priv, 
	}

	/* Initialize videobuf queue as per the buffer type */

	layer->alloc_ctx = vb2_dma_contig_init_ctx(vpbe_dev->pdev);

	if (!layer->alloc_ctx) {

	if (IS_ERR(layer->alloc_ctx)) {

		v4l2_err(&vpbe_dev->v4l2_dev, "Failed to get the context\n");

		return -EINVAL;

		return PTR_ERR(layer->alloc_ctx);

	}

	q = &layer->buffer_queue;

	memset(q, 0, sizeof(*q));