diff options
| author |   Zhang Changzhong <zhangchangzhong@huawei.com> | 2020-12-04 09:27:58 +0100 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-01-12 18:23:51 +0100 |
| commit | d497fcdab02996a4510d5dd0d743447c737c317a (patch) | |
| tree | dfa2885f2ce785d6216aa62652e98deddda0ada4 /drivers/media/platform/aspeed-video.c | |
| parent | media: pwc: Use correct device for DMA (diff) | |
| download | linux-dev-d497fcdab02996a4510d5dd0d743447c737c317a.tar.xz linux-dev-d497fcdab02996a4510d5dd0d743447c737c317a.zip | |
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: 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>
Diffstat (limited to 'drivers/media/platform/aspeed-video.c')
| -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 c46a79eace98..f2c4dadd6a0e 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; } |