diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-14 08:36:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-14 08:36:50 -0300 |
| commit | f73d4223cf12d0d65a3bd9d6da0ff8807c86d064 (patch) | |
| tree | 69f2f087b6053c218a8f5431f56aff437c8ee538 /linux/drivers/media/video/v4l2-device.c | |
| parent | 7e2fc0b0dd4648fcd4c2ca82093aebcfaed3e863 (diff) | |
| parent | bdef8c3d9a3ba2fab464529580ae8028d74e8aff (diff) | |
| download | mediapointer-dvb-s2-f73d4223cf12d0d65a3bd9d6da0ff8807c86d064.tar.gz mediapointer-dvb-s2-f73d4223cf12d0d65a3bd9d6da0ff8807c86d064.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/k2c2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-device.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/v4l2-device.c b/linux/drivers/media/video/v4l2-device.c index c76f83840..b962862fe 100644 --- a/linux/drivers/media/video/v4l2-device.c +++ b/linux/drivers/media/video/v4l2-device.c @@ -86,6 +86,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev) /* Unregister subdevs */ list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) { v4l2_device_unregister_subdev(sd); +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { struct i2c_client *client = v4l2_get_subdevdata(sd); @@ -96,6 +97,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev) if (client) i2c_unregister_device(client); } +#endif } } EXPORT_SYMBOL_GPL(v4l2_device_unregister); |