diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-11 09:37:41 -0700 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-05-11 09:37:41 -0700 |
| commit | e8b29e62cfa708cab8f3f2dc6cb55a433ccfe561 (patch) | |
| tree | a2ab619f0f09cbe75682c4f401c8ae5a5b5f3e6b | |
| parent | 01fac01fcb8830923bc85ba8d13146921d821dac (diff) | |
| download | mediapointer-dvb-s2-e8b29e62cfa708cab8f3f2dc6cb55a433ccfe561.tar.gz mediapointer-dvb-s2-e8b29e62cfa708cab8f3f2dc6cb55a433ccfe561.tar.bz2 | |
2: handle unregister for non-I2C builds
From: Randy Dunlap <randy.dunlap@oracle.com>
Build fails when CONFIG_I2C=n, so handle that case in the if block:
drivers/built-in.o: In function `v4l2_device_unregister':
(.text+0x157821): undefined reference to `i2c_unregister_device'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -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); |