aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/vivi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 9a8ded371eb8..059b01c11dc1 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -39,7 +39,7 @@
39#include <linux/highmem.h> 39#include <linux/highmem.h>
40#include <linux/freezer.h> 40#include <linux/freezer.h>
41 41
42#define MODULE_NAME "vivi" 42#define VIVI_MODULE_NAME "vivi"
43 43
44/* Wake up at about 30 fps */ 44/* Wake up at about 30 fps */
45#define WAKE_NUMERATOR 30 45#define WAKE_NUMERATOR 30
@@ -1022,11 +1022,11 @@ static int vivi_release(void)
1022 if (-1 != dev->vfd->minor) { 1022 if (-1 != dev->vfd->minor) {
1023 video_unregister_device(dev->vfd); 1023 video_unregister_device(dev->vfd);
1024 printk(KERN_INFO "%s: /dev/video%d unregistered.\n", 1024 printk(KERN_INFO "%s: /dev/video%d unregistered.\n",
1025 MODULE_NAME, dev->vfd->minor); 1025 VIVI_MODULE_NAME, dev->vfd->minor);
1026 } else { 1026 } else {
1027 video_device_release(dev->vfd); 1027 video_device_release(dev->vfd);
1028 printk(KERN_INFO "%s: /dev/video%d released.\n", 1028 printk(KERN_INFO "%s: /dev/video%d released.\n",
1029 MODULE_NAME, dev->vfd->minor); 1029 VIVI_MODULE_NAME, dev->vfd->minor);
1030 } 1030 }
1031 1031
1032 kfree(dev); 1032 kfree(dev);
@@ -1139,7 +1139,7 @@ static int __init vivi_init(void)
1139 1139
1140 dev->vfd = vfd; 1140 dev->vfd = vfd;
1141 printk(KERN_INFO "%s: V4L2 device registered as /dev/video%d\n", 1141 printk(KERN_INFO "%s: V4L2 device registered as /dev/video%d\n",
1142 MODULE_NAME, vfd->minor); 1142 VIVI_MODULE_NAME, vfd->minor);
1143 } 1143 }
1144 1144
1145 if (ret < 0) { 1145 if (ret < 0) {