diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-10 11:58:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-10 11:58:22 -0300 |
| commit | 96768446c3bdd84dffc002636e39a0aa3708d9df (patch) | |
| tree | eb9f7def6d42917c0d472ae021a66e445470257c /linux/drivers/media | |
| parent | 6efca26e38f50e85f210e25323eceacce61d6ebe (diff) | |
| download | mediapointer-dvb-s2-96768446c3bdd84dffc002636e39a0aa3708d9df.tar.gz mediapointer-dvb-s2-96768446c3bdd84dffc002636e39a0aa3708d9df.tar.bz2 | |
Fix v4l2-device usage of i2c_unregister_device()
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix v4l2-device usage of i2c_unregister_device() and handle the case of
CONFIG_I2C=m & CONFIG_MEDIA_VIDEO=y.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/v4l2-device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-device.c b/linux/drivers/media/video/v4l2-device.c index 18d404499..4fa93189d 100644 --- a/linux/drivers/media/video/v4l2-device.c +++ b/linux/drivers/media/video/v4l2-device.c @@ -86,7 +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 defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { struct i2c_client *client = v4l2_get_subdevdata(sd); |