lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 088/340] media: aspeed: fix error return code in aspeed_video_setup_video()
    Date
    From: Zhang Changzhong <zhangchangzhong@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 <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>
    ---
    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 4eaaf39b9223c..e0299a7899231 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;
    }

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-01 23:12    [W:4.163 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site