lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 080/434] media: ov6650: Fix control handler not freed on init error
    Date
    From: Janusz Krzysztofik <jmkrzyszt@gmail.com>

    [ Upstream commit c404af950d14b71bfbf574a752b6c29d726baaba ]

    Since commit afd9690c72c3 ("[media] ov6650: convert to the control
    framework"), if an error occurs during initialization of a control
    handler, resources possibly allocated to the handler are not freed
    before device initialiaton is aborted. Fix it.

    Fixes: afd9690c72c3 ("[media] ov6650: convert to the control framework")
    Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/i2c/ov6650.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c
    index 5b9af5e5b7f1..68776b0710f9 100644
    --- a/drivers/media/i2c/ov6650.c
    +++ b/drivers/media/i2c/ov6650.c
    @@ -989,8 +989,10 @@ static int ov6650_probe(struct i2c_client *client,
    V4L2_CID_GAMMA, 0, 0xff, 1, 0x12);

    priv->subdev.ctrl_handler = &priv->hdl;
    - if (priv->hdl.error)
    - return priv->hdl.error;
    + if (priv->hdl.error) {
    + ret = priv->hdl.error;
    + goto ectlhdlfree;
    + }

    v4l2_ctrl_auto_cluster(2, &priv->autogain, 0, true);
    v4l2_ctrl_auto_cluster(3, &priv->autowb, 0, true);
    @@ -1008,8 +1010,10 @@ static int ov6650_probe(struct i2c_client *client,
    priv->subdev.internal_ops = &ov6650_internal_ops;

    ret = v4l2_async_register_subdev(&priv->subdev);
    - if (ret)
    - v4l2_ctrl_handler_free(&priv->hdl);
    + if (!ret)
    + return 0;
    +ectlhdlfree:
    + v4l2_ctrl_handler_free(&priv->hdl);

    return ret;
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 18:45    [W:4.165 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site