Commit 6a2f18cf authored by Wei Yongjun's avatar Wei Yongjun Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-tv: fix error return code in mxr_acquire_video() 



Fix to return a negative error code in the vb2_dma_contig_init_ctx()
error handling case instead of 0, as done elsewhere in this function.
Also vb2_dma_contig_init_ctx() return ERR_PTR() in case of error and
never return NULL, so use IS_ERR() replace IS_ERR_OR_NULL().

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d46a5a68

drivers/media/platform/s5p-tv/mixer_video.c

+2 −1
Original line number Diff line number Diff line
@@ -81,8 +81,9 @@ int mxr_acquire_video(struct mxr_device *mdev, 
	}



	mdev->alloc_ctx = vb2_dma_contig_init_ctx(mdev->dev);

	if (IS_ERR_OR_NULL(mdev->alloc_ctx)) {

	if (IS_ERR(mdev->alloc_ctx)) {

		mxr_err(mdev, "could not acquire vb2 allocator\n");

		ret = PTR_ERR(mdev->alloc_ctx);

		goto fail_v4l2_dev;

	}