lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 008/261] media: vicodec: Fix error codes in probe function
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit f36592e7b343d853edf44d3545bb68961c0949a4 ]

    If these functions fail then we return success, but we should instead
    preserve negative error code and return that.

    Fixes: fde649b418d1 ("media: vicodec: Register another node for stateless decoder")
    Fixes: c022a4a95722 ("media: vicodec: add struct for encoder/decoder instance")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.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/vicodec/vicodec-core.c | 15 +++++++++------
    1 file changed, 9 insertions(+), 6 deletions(-)

    diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
    index 82350097503e..84ec36156f73 100644
    --- a/drivers/media/platform/vicodec/vicodec-core.c
    +++ b/drivers/media/platform/vicodec/vicodec-core.c
    @@ -2172,16 +2172,19 @@ static int vicodec_probe(struct platform_device *pdev)

    platform_set_drvdata(pdev, dev);

    - if (register_instance(dev, &dev->stateful_enc,
    - "stateful-encoder", true))
    + ret = register_instance(dev, &dev->stateful_enc, "stateful-encoder",
    + true);
    + if (ret)
    goto unreg_dev;

    - if (register_instance(dev, &dev->stateful_dec,
    - "stateful-decoder", false))
    + ret = register_instance(dev, &dev->stateful_dec, "stateful-decoder",
    + false);
    + if (ret)
    goto unreg_sf_enc;

    - if (register_instance(dev, &dev->stateless_dec,
    - "stateless-decoder", false))
    + ret = register_instance(dev, &dev->stateless_dec, "stateless-decoder",
    + false);
    + if (ret)
    goto unreg_sf_dec;

    #ifdef CONFIG_MEDIA_CONTROLLER
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 18:12    [W:2.110 / U:1.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site