Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14cd5a8e authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 67e4550ecd6164bfbdff54c169e5bbf9ccfaf14d ]

Call i2c_unregister_device(audio) on this error path.

Fixes: d3b2ccd9 ("[media] s2250: convert to the control framework")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 92f84aa8

drivers/media/usb/go7007/s2250-board.c

+4 −6
Original line number Diff line number Diff line
@@ -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)