aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vivi.c
diff options
context:
space:
mode:
authorCarl Karsten <carl@personnelware.com>2008-06-09 23:02:32 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:09:13 -0400
commit745271aefec602326b1dafded778d1eb94bc50ad (patch)
tree0e18cfe4a83fd9225e0b18b3c678e687b5d04ecb /drivers/media/video/vivi.c
parent878cf2a5d86c7045b480f09b56b96a779449b0f6 (diff)
V4L/DVB (8023): vivi: announce that it is registered as /dev/video%d
Signed-off-by: Carl Karsten <carl@personnelware.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r--drivers/media/video/vivi.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index a9747a10c546..9a8ded371eb8 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -39,6 +39,8 @@
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"
43
42/* Wake up at about 30 fps */ 44/* Wake up at about 30 fps */
43#define WAKE_NUMERATOR 30 45#define WAKE_NUMERATOR 30
44#define WAKE_DENOMINATOR 1001 46#define WAKE_DENOMINATOR 1001
@@ -47,7 +49,7 @@
47#include "font.h" 49#include "font.h"
48 50
49#define VIVI_MAJOR_VERSION 0 51#define VIVI_MAJOR_VERSION 0
50#define VIVI_MINOR_VERSION 4 52#define VIVI_MINOR_VERSION 5
51#define VIVI_RELEASE 0 53#define VIVI_RELEASE 0
52#define VIVI_VERSION \ 54#define VIVI_VERSION \
53 KERNEL_VERSION(VIVI_MAJOR_VERSION, VIVI_MINOR_VERSION, VIVI_RELEASE) 55 KERNEL_VERSION(VIVI_MAJOR_VERSION, VIVI_MINOR_VERSION, VIVI_RELEASE)
@@ -1017,10 +1019,15 @@ static int vivi_release(void)
1017 list_del(list); 1019 list_del(list);
1018 dev = list_entry(list, struct vivi_dev, vivi_devlist); 1020 dev = list_entry(list, struct vivi_dev, vivi_devlist);
1019 1021
1020 if (-1 != dev->vfd->minor) 1022 if (-1 != dev->vfd->minor) {
1021 video_unregister_device(dev->vfd); 1023 video_unregister_device(dev->vfd);
1022 else 1024 printk(KERN_INFO "%s: /dev/video%d unregistered.\n",
1025 MODULE_NAME, dev->vfd->minor);
1026 } else {
1023 video_device_release(dev->vfd); 1027 video_device_release(dev->vfd);
1028 printk(KERN_INFO "%s: /dev/video%d released.\n",
1029 MODULE_NAME, dev->vfd->minor);
1030 }
1024 1031
1025 kfree(dev); 1032 kfree(dev);
1026 } 1033 }
@@ -1131,6 +1138,8 @@ static int __init vivi_init(void)
1131 video_nr++; 1138 video_nr++;
1132 1139
1133 dev->vfd = vfd; 1140 dev->vfd = vfd;
1141 printk(KERN_INFO "%s: V4L2 device registered as /dev/video%d\n",
1142 MODULE_NAME, vfd->minor);
1134 } 1143 }
1135 1144
1136 if (ret < 0) { 1145 if (ret < 0) {
@@ -1138,7 +1147,9 @@ static int __init vivi_init(void)
1138 printk(KERN_INFO "Error %d while loading vivi driver\n", ret); 1147 printk(KERN_INFO "Error %d while loading vivi driver\n", ret);
1139 } else 1148 } else
1140 printk(KERN_INFO "Video Technology Magazine Virtual Video " 1149 printk(KERN_INFO "Video Technology Magazine Virtual Video "
1141 "Capture Board successfully loaded.\n"); 1150 "Capture Board ver %u.%u.%u successfully loaded.\n",
1151 (VIVI_VERSION >> 16) & 0xFF, (VIVI_VERSION >> 8) & 0xFF,
1152 VIVI_VERSION & 0xFF);
1142 return ret; 1153 return ret;
1143} 1154}
1144 1155