media: usb: go7007: s2250-board: fix leak in probe()

[ 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>

diff --git a/drivers/media/usb/go7007/s2250-board.c b/drivers/media/usb/go7007/s2250-board.c
index 1466db150d82cc93e91a14dd7c3c47851b330537..625e77f4dbd2e1558175d5063732104f7e249258 100644 (file)
--- a/drivers/media/usb/go7007/s2250-board.c
+++ b/drivers/media/usb/go7007/s2250-board.c
@@ -512,6 +512,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(adapter, TLV320_ADDRESS >> 1);
        if (audio == NULL)
@@ -540,11 +541,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;
@@ -608,7 +606,7 @@ fail:
        i2c_unregister_device(audio);
        v4l2_ctrl_handler_free(&state->hdl);
        kfree(state);
-       return -EIO;
+       return err;
 }
 
 static int s2250_remove(struct i2c_client *client)