Commit d497fcda authored by Zhang Changzhong's avatar Zhang Changzhong Committed by Mauro Carvalho Chehab
Browse files

media: aspeed: fix error return code in aspeed_video_setup_video() 



Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: d2b4387f ("media: platform: Add Aspeed Video Engine driver")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 69c9e825

drivers/media/platform/aspeed-video.c

+3 −3
Original line number Diff line number Diff line
@@ -1551,12 +1551,12 @@ static int aspeed_video_setup_video(struct aspeed_video *video) 
			       V4L2_JPEG_CHROMA_SUBSAMPLING_420, mask,

			       V4L2_JPEG_CHROMA_SUBSAMPLING_444);



	if (video->ctrl_handler.error) {

	rc = video->ctrl_handler.error;

	if (rc) {

		v4l2_ctrl_handler_free(&video->ctrl_handler);

		v4l2_device_unregister(v4l2_dev);



		dev_err(video->dev, "Failed to init controls: %d\n",

			video->ctrl_handler.error);

		dev_err(video->dev, "Failed to init controls: %d\n", rc);

		return rc;

	}