[PATCH 5.11 204/775] media: aspeed: fix error return code in aspeed_video_setup_video()

[Greg Kroah-Hartman]

From: Zhang Changzhong <zhangchangzh...@huawei.com>

[ 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 <hul...@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzh...@huawei.com>
Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+hua...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/media/platform/aspeed-video.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/aspeed-video.c 
b/drivers/media/platform/aspeed-video.c
index c46a79eace98b..f2c4dadd6a0eb 100644
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -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;
        }
 
-- 
2.27.0