diff options
Diffstat (limited to 'drivers/staging/easycap')
-rw-r--r-- | drivers/staging/easycap/easycap_main.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c index cfdbb575322..4385236b288 100644 --- a/drivers/staging/easycap/easycap_main.c +++ b/drivers/staging/easycap/easycap_main.c | |||
@@ -4829,10 +4829,10 @@ static int __init easycap_module_init(void) | |||
4829 | { | 4829 | { |
4830 | int k, rc; | 4830 | int k, rc; |
4831 | 4831 | ||
4832 | SAY("========easycap=======\n"); | 4832 | printk(KERN_INFO "Easycap version: "EASYCAP_DRIVER_VERSION "\n"); |
4833 | |||
4833 | JOT(4, "begins. %i=debug %i=bars %i=gain\n", | 4834 | JOT(4, "begins. %i=debug %i=bars %i=gain\n", |
4834 | easycap_debug, easycap_bars, easycap_gain); | 4835 | easycap_debug, easycap_bars, easycap_gain); |
4835 | SAY("version: " EASYCAP_DRIVER_VERSION "\n"); | ||
4836 | 4836 | ||
4837 | mutex_init(&mutex_dongle); | 4837 | mutex_init(&mutex_dongle); |
4838 | for (k = 0; k < DONGLE_MANY; k++) { | 4838 | for (k = 0; k < DONGLE_MANY; k++) { |
@@ -4840,22 +4840,16 @@ static int __init easycap_module_init(void) | |||
4840 | mutex_init(&easycapdc60_dongle[k].mutex_video); | 4840 | mutex_init(&easycapdc60_dongle[k].mutex_video); |
4841 | mutex_init(&easycapdc60_dongle[k].mutex_audio); | 4841 | mutex_init(&easycapdc60_dongle[k].mutex_audio); |
4842 | } | 4842 | } |
4843 | JOT(4, "registering driver easycap\n"); | ||
4844 | rc = usb_register(&easycap_usb_driver); | 4843 | rc = usb_register(&easycap_usb_driver); |
4845 | if (rc) | 4844 | if (rc) |
4846 | SAY("ERROR: usb_register returned %i\n", rc); | 4845 | printk(KERN_ERR "Easycap: usb_register failed rc=%d\n", rc); |
4847 | 4846 | ||
4848 | JOT(4, "ends\n"); | ||
4849 | return rc; | 4847 | return rc; |
4850 | } | 4848 | } |
4851 | /*****************************************************************************/ | 4849 | /*****************************************************************************/ |
4852 | static void __exit easycap_module_exit(void) | 4850 | static void __exit easycap_module_exit(void) |
4853 | { | 4851 | { |
4854 | JOT(4, "begins\n"); | ||
4855 | |||
4856 | usb_deregister(&easycap_usb_driver); | 4852 | usb_deregister(&easycap_usb_driver); |
4857 | |||
4858 | JOT(4, "ends\n"); | ||
4859 | } | 4853 | } |
4860 | /*****************************************************************************/ | 4854 | /*****************************************************************************/ |
4861 | 4855 | ||