Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94b76a88 authored by Wei Yongjun's avatar Wei Yongjun Committed by Mauro Carvalho Chehab
Browse files

[media] davinci: vpif: fix return value check for vb2_dma_contig_init_ctx() 

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().
dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch

)

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: default avatarLad, Prabhakar <prabhakar.lad@ti.com>
[prabhakar.lad@ti.com: reword commit header]
Signed-off-by: default avatarLad, Prabhakar <prabhakar.lad@ti.com>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 63af4af5

drivers/media/platform/davinci/vpif_capture.c

+2 −2
Original line number Diff line number Diff line
@@ -1004,9 +1004,9 @@ static int vpif_reqbufs(struct file *file, void *priv, 


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

	common->alloc_ctx = vb2_dma_contig_init_ctx(vpif_dev);

	if (!common->alloc_ctx) {

	if (IS_ERR(common->alloc_ctx)) {

		vpif_err("Failed to get the context\n");

		return -EINVAL;

		return PTR_ERR(common->alloc_ctx);

	}

	q = &common->buffer_queue;

	q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

drivers/media/platform/davinci/vpif_display.c

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

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

	common->alloc_ctx = vb2_dma_contig_init_ctx(vpif_dev);

	if (!common->alloc_ctx) {

	if (IS_ERR(common->alloc_ctx)) {

		vpif_err("Failed to get the context\n");

		return -EINVAL;

		return PTR_ERR(common->alloc_ctx);

	}

	q = &common->buffer_queue;

	q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;