V4L/DVB (11936): Fix v4l2-device usage of i2c_unregister_device()
authorRandy Dunlap <randy.dunlap@oracle.com>
Wed, 10 Jun 2009 14:58:22 +0000 (11:58 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 16 Jun 2009 22:07:26 +0000 (19:07 -0300)
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>
drivers/media/video/v4l2-device.c

index 772833b69bbf0523bc63e07e7a7483d2ab4695a8..0d06e7cbd5b3187aee89bbcfb14410c69ffb013b 100644 (file)
@@ -85,7 +85,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 (sd->flags & V4L2_SUBDEV_FL_IS_I2C) {
                        struct i2c_client *client = v4l2_get_subdevdata(sd);