diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2009-05-11 12:37:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 17:21:01 -0400 |
commit | b7fd6067143181becb5b14765f4ad25857846491 (patch) | |
tree | fafa5962a621e213cd1200d4a2dec13eaf6ac213 /drivers/media/video/v4l2-device.c | |
parent | 507a34f450e3bac2940da4549ca56bcba25184e7 (diff) |
V4L/DVB (11758): 2: handle unregister for non-I2C builds
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>
Diffstat (limited to 'drivers/media/video/v4l2-device.c')
-rw-r--r-- | drivers/media/video/v4l2-device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c index e1520bc84f71..772833b69bbf 100644 --- a/drivers/media/video/v4l2-device.c +++ b/drivers/media/video/v4l2-device.c | |||
@@ -85,6 +85,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev) | |||
85 | /* Unregister subdevs */ | 85 | /* Unregister subdevs */ |
86 | list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) { | 86 | list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) { |
87 | v4l2_device_unregister_subdev(sd); | 87 | v4l2_device_unregister_subdev(sd); |
88 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | ||
88 | if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { | 89 | if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { |
89 | struct i2c_client *client = v4l2_get_subdevdata(sd); | 90 | struct i2c_client *client = v4l2_get_subdevdata(sd); |
90 | 91 | ||
@@ -95,6 +96,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev) | |||
95 | if (client) | 96 | if (client) |
96 | i2c_unregister_device(client); | 97 | i2c_unregister_device(client); |
97 | } | 98 | } |
99 | #endif | ||
98 | } | 100 | } |
99 | } | 101 | } |
100 | EXPORT_SYMBOL_GPL(v4l2_device_unregister); | 102 | EXPORT_SYMBOL_GPL(v4l2_device_unregister); |