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

BugLink: https://bugs.launchpad.net/bugs/1918974
[ Upstream commit d497fcdab02996a4510d5dd0d743447c737c317a ]

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

Fixes: d2b4387f3bdf ("media: platform: Add Aspeed Video Engine driver")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index 4eaaf39b9223c4b6800e3cbd4f5cd1a86f451f4b..e0299a7899231e313ef0c74293b5ace4680193b1 100644 (file)
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -1529,12 +1529,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;
        }