diff options
| author | Zhang Changzhong <zhangchangzhong@huawei.com> | 2020-12-04 09:27:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-04 10:26:21 +0100 |
| commit | c7ebd8b358b0eadfef07e4ed1f076541f1a3585d (patch) | |
| tree | 1c70bbaf6d3ddabb22649939a80714c8c6eaaf5d /drivers/media/platform | |
| parent | 438d2cc7b8cc4b54bf8d1610a91de6258e10b375 (diff) | |
| download | linux-c7ebd8b358b0eadfef07e4ed1f076541f1a3585d.tar.gz linux-c7ebd8b358b0eadfef07e4ed1f076541f1a3585d.tar.bz2 linux-c7ebd8b358b0eadfef07e4ed1f076541f1a3585d.zip | |
media: aspeed: fix error return code in aspeed_video_setup_video()
[ 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>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/aspeed-video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 4eaaf39b9223..e0299a789923 100644 --- 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; } |