aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/mdtv/smscoreapi.c
diff options
context:
space:
mode:
authorSteven Toth <stoth@hauppauge.com>2008-05-22 17:04:36 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:20:30 -0400
commiteae55660fc4a7f17f0f87458d8ada2b51b1833c1 (patch)
tree10b91e1c1cf2bb24b87d24d9cca10edf221833fa /drivers/media/mdtv/smscoreapi.c
parent159ed4bbc394bb3e547eb64fdd3a59141ced131a (diff)
V4L/DVB (8268): sms1xxx: usb cleanup
Signed-off-by: Steven Toth <stoth@hauppauge.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/mdtv/smscoreapi.c')
-rw-r--r--drivers/media/mdtv/smscoreapi.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/mdtv/smscoreapi.c b/drivers/media/mdtv/smscoreapi.c
index 715dde034e8..6d21ff39122 100644
--- a/drivers/media/mdtv/smscoreapi.c
+++ b/drivers/media/mdtv/smscoreapi.c
@@ -1104,6 +1104,12 @@ int smscore_module_init(void)
1104 INIT_LIST_HEAD(&g_smscore_registry); 1104 INIT_LIST_HEAD(&g_smscore_registry);
1105 kmutex_init(&g_smscore_registrylock); 1105 kmutex_init(&g_smscore_registrylock);
1106 1106
1107 /* USB Register */
1108 rc = smsusb_register();
1109
1110 /* DVB Register */
1111 rc = smsdvb_register();
1112
1107 printk(KERN_INFO "%s, rc %d\n", __FUNCTION__, rc); 1113 printk(KERN_INFO "%s, rc %d\n", __FUNCTION__, rc);
1108 1114
1109 return rc; 1115 return rc;
@@ -1111,6 +1117,7 @@ int smscore_module_init(void)
1111 1117
1112void smscore_module_exit(void) 1118void smscore_module_exit(void)
1113{ 1119{
1120
1114 kmutex_lock(&g_smscore_deviceslock); 1121 kmutex_lock(&g_smscore_deviceslock);
1115 while (!list_empty(&g_smscore_notifyees)) 1122 while (!list_empty(&g_smscore_notifyees))
1116 { 1123 {
@@ -1131,6 +1138,12 @@ void smscore_module_exit(void)
1131 } 1138 }
1132 kmutex_unlock(&g_smscore_registrylock); 1139 kmutex_unlock(&g_smscore_registrylock);
1133 1140
1141 /* DVB UnRegister */
1142 smsdvb_unregister();
1143
1144 /* Unregister USB */
1145 smsusb_unregister();
1146
1134 printk(KERN_INFO "%s\n", __FUNCTION__); 1147 printk(KERN_INFO "%s\n", __FUNCTION__);
1135} 1148}
1136 1149