diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-05-02 10:58:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 18:20:51 -0300 |
| commit | b5b2b7ed569cedac4f5da38e08b01c88443187bd (patch) | |
| tree | d21f735f5f50fd79ea72d176a2ec2872218ef0a2 /drivers/media/video/v4l2-device.c | |
| parent | a79b11c025a5757a5129e716e7e66dc36a2dfe21 (diff) | |
| download | op-kernel-dev-b5b2b7ed569cedac4f5da38e08b01c88443187bd.zip op-kernel-dev-b5b2b7ed569cedac4f5da38e08b01c88443187bd.tar.gz | |
V4L/DVB (11673): v4l2-device: unregister i2c_clients when unregistering the v4l2_device.
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>
Diffstat (limited to 'drivers/media/video/v4l2-device.c')
| -rw-r--r-- | drivers/media/video/v4l2-device.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c index ffb425f..e1520bc 100644 --- a/drivers/media/video/v4l2-device.c +++ b/drivers/media/video/v4l2-device.c @@ -83,8 +83,19 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev) v4l2_device_disconnect(v4l2_dev); /* 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); + 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); |
