UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Randy Dunlap 2009-05-11 13:37:41 -03:00 committed by Mauro Carvalho Chehab
parent 507a34f450
commit b7fd606714
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/v4l2-device.c
View File

@ -85,6 +85,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
/* Unregister subdevs */ /* 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); v4l2_device_unregister_subdev(sd);
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) {
struct i2c_client *client = v4l2_get_subdevdata(sd); struct i2c_client *client = v4l2_get_subdevdata(sd);
@ -95,6 +96,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
if (client) if (client)
i2c_unregister_device(client); i2c_unregister_device(client);
} }
#endif
} }
} }
EXPORT_SYMBOL_GPL(v4l2_device_unregister); EXPORT_SYMBOL_GPL(v4l2_device_unregister);