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

Commit 7c026c35 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10983): v4l2-common: add missing i2c_unregister_device. 



If the i2c sub-device cannot be found, then we must unregister the i2c_client.
Otherwise this will prevent a possible probe for a different device on that same
address.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2c792523

drivers/media/video/v4l2-common.c

+16 −5
Original line number Diff line number Diff line
@@ -813,11 +813,11 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter, 
	   We need better support from the kernel so that we

	   can easily wait for the load to finish. */

	if (client == NULL || client->driver == NULL)

		return NULL;

		goto error;



	/* Lock the module so we can safely get the v4l2_subdev pointer */

	if (!try_module_get(client->driver->driver.owner))

		return NULL;

		goto error;

	sd = i2c_get_clientdata(client);



	/* Register with the v4l2_device which increases the module's
@@ -826,8 +826,13 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(struct i2c_adapter *adapter, 
		sd = NULL;

	/* Decrease the module use count to match the first try_module_get. */

	module_put(client->driver->driver.owner);

	return sd;



error:

	/* If we have a client but no subdev, then something went wrong and

	   we must unregister the client. */

	if (client && sd == NULL)

		i2c_unregister_device(client);

	return sd;

}

EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
@@ -860,11 +865,11 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter, 
	   We need better support from the kernel so that we

	   can easily wait for the load to finish. */

	if (client == NULL || client->driver == NULL)

		return NULL;

		goto error;



	/* Lock the module so we can safely get the v4l2_subdev pointer */

	if (!try_module_get(client->driver->driver.owner))

		return NULL;

		goto error;

	sd = i2c_get_clientdata(client);



	/* Register with the v4l2_device which increases the module's
@@ -873,6 +878,12 @@ struct v4l2_subdev *v4l2_i2c_new_probed_subdev(struct i2c_adapter *adapter, 
		sd = NULL;

	/* Decrease the module use count to match the first try_module_get. */

	module_put(client->driver->driver.owner);



error:

	/* If we have a client but no subdev, then something went wrong and

	   we must unregister the client. */

	if (client && sd == NULL)

		i2c_unregister_device(client);

	return sd;

}

EXPORT_SYMBOL_GPL(v4l2_i2c_new_probed_subdev);