lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (11673): v4l2-device: unregister i2c_clients when unregistering the v4l2_device.

Browse Source 
Until now I relied on i2c_del_adapter to unregister the i2c_clients for
me, however, if the i2c bus is a platform bus then it is never deleted.

So instead I need to unregister i2c clients when unregistering the
v4l2_device.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil
2009-05-02 10:58:51 -03:00
committed by Mauro Carvalho Chehab
parent a79b11c025
commit b5b2b7ed56
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/video/v4l2-common.c
View File

@@ -746,6 +746,7 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
const struct v4l2_subdev_ops *ops) const struct v4l2_subdev_ops *ops)
{ {
v4l2_subdev_init(sd, ops); v4l2_subdev_init(sd, ops);
sd->flags |= V4L2_SUBDEV_FL_IS_I2C;
/* the owner is the same as the i2c_client's driver owner */ /* the owner is the same as the i2c_client's driver owner */
sd->owner = client->driver->driver.owner; sd->owner = client->driver->driver.owner;
/* i2c_client and v4l2_subdev point to one another */ /* i2c_client and v4l2_subdev point to one another */

13
drivers/media/video/v4l2-device.c
View File

@@ -83,8 +83,19 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
v4l2_device_disconnect(v4l2_dev); v4l2_device_disconnect(v4l2_dev);
/* Unregister subdevs */ /* Unregister subdevs */
list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) {
v4l2_device_unregister_subdev(sd); v4l2_device_unregister_subdev(sd);
if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) {
struct i2c_client *client = v4l2_get_subdevdata(sd);
/* We need to unregister the i2c client explicitly.
We cannot rely on i2c_del_adapter to always
unregister clients for us, since if the i2c bus
is a platform bus, then it is never deleted. */
if (client)
i2c_unregister_device(client);
}
}
} }
EXPORT_SYMBOL_GPL(v4l2_device_unregister); EXPORT_SYMBOL_GPL(v4l2_device_unregister);

5
include/media/v4l2-subdev.h
View File

@@ -230,12 +230,16 @@ struct v4l2_subdev_ops {
#define V4L2_SUBDEV_NAME_SIZE 32 #define V4L2_SUBDEV_NAME_SIZE 32
/* Set this flag if this subdev is a i2c device. */
#define V4L2_SUBDEV_FL_IS_I2C (1U << 0)
/* Each instance of a subdev driver should create this struct, either /* Each instance of a subdev driver should create this struct, either
stand-alone or embedded in a larger struct. stand-alone or embedded in a larger struct.
*/ */
struct v4l2_subdev { struct v4l2_subdev {
struct list_head list; struct list_head list;
struct module *owner; struct module *owner;
u32 flags;
struct v4l2_device *v4l2_dev; struct v4l2_device *v4l2_dev;
const struct v4l2_subdev_ops *ops; const struct v4l2_subdev_ops *ops;
/* name must be unique */ /* name must be unique */
@@ -264,6 +268,7 @@ static inline void v4l2_subdev_init(struct v4l2_subdev *sd,
BUG_ON(!ops || !ops->core); BUG_ON(!ops || !ops->core);
sd->ops = ops; sd->ops = ops;
sd->v4l2_dev = NULL; sd->v4l2_dev = NULL;
sd->flags = 0;
sd->name[0] = '\0'; sd->name[0] = '\0';
sd->grp_id = 0; sd->grp_id = 0;
sd->priv = NULL; sd->priv = NULL;