lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 128/475] media: usb: go7007: s2250-board: fix leak in probe()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit 67e4550ecd6164bfbdff54c169e5bbf9ccfaf14d ]

    Call i2c_unregister_device(audio) on this error path.

    Fixes: d3b2ccd9e307 ("[media] s2250: convert to the control framework")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/go7007/s2250-board.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/drivers/media/usb/go7007/s2250-board.c b/drivers/media/usb/go7007/s2250-board.c
    index 49e75a1a1f3f..af3b18c6d9e1 100644
    --- a/drivers/media/usb/go7007/s2250-board.c
    +++ b/drivers/media/usb/go7007/s2250-board.c
    @@ -504,6 +504,7 @@ static int s2250_probe(struct i2c_client *client,
    u8 *data;
    struct go7007 *go = i2c_get_adapdata(adapter);
    struct go7007_usb *usb = go->hpi_context;
    + int err = -EIO;

    audio = i2c_new_dummy_device(adapter, TLV320_ADDRESS >> 1);
    if (IS_ERR(audio))
    @@ -532,11 +533,8 @@ static int s2250_probe(struct i2c_client *client,
    V4L2_CID_HUE, -512, 511, 1, 0);
    sd->ctrl_handler = &state->hdl;
    if (state->hdl.error) {
    - int err = state->hdl.error;
    -
    - v4l2_ctrl_handler_free(&state->hdl);
    - kfree(state);
    - return err;
    + err = state->hdl.error;
    + goto fail;
    }

    state->std = V4L2_STD_NTSC;
    @@ -600,7 +598,7 @@ static int s2250_probe(struct i2c_client *client,
    i2c_unregister_device(audio);
    v4l2_ctrl_handler_free(&state->hdl);
    kfree(state);
    - return -EIO;
    + return err;
    }

    static int s2250_remove(struct i2c_client *client)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-14 16:23    [W:2.646 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site