diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-21 15:46:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-23 01:06:35 -0300 |
| commit | 54d80904b4c1f7aa1d569d07ca3e62fba0daf3a2 (patch) | |
| tree | b746cf05f9e3d613d3dd84871363094fbcc2f44a | |
| parent | 13828c61e9d3fd293c284fd24077f1f7d0946458 (diff) | |
| download | lwn-54d80904b4c1f7aa1d569d07ca3e62fba0daf3a2.tar.gz lwn-54d80904b4c1f7aa1d569d07ca3e62fba0daf3a2.zip | |
[media] hdpvr-video: Use the proper check for I2C support
As reported by Geert Uytterhoeven <geert@linux-m68k.org>:
drivers/media/usb/hdpvr/hdpvr-video.c: warning: "CONFIG_I2C_MODULE" is not defined [-Wundef]
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Thanks-to: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c index da6b77912222..6a15405360dc 100644 --- a/drivers/media/usb/hdpvr/hdpvr-video.c +++ b/drivers/media/usb/hdpvr/hdpvr-video.c @@ -10,6 +10,7 @@ */ #include <linux/kernel.h> +#include <linux/kconfig.h> #include <linux/errno.h> #include <linux/init.h> #include <linux/slab.h> @@ -1238,7 +1239,7 @@ static void hdpvr_device_release(struct video_device *vdev) v4l2_device_unregister(&dev->v4l2_dev); /* deregister I2C adapter */ -#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) mutex_lock(&dev->i2c_mutex); i2c_del_adapter(&dev->i2c_adapter); mutex_unlock(&dev->i2c_mutex); |