aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/gigaset/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/gigaset/common.c')
-rw-r--r--drivers/isdn/gigaset/common.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 85de3399a2f2..f6f45f221920 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -14,7 +14,6 @@
14 */ 14 */
15 15
16#include "gigaset.h" 16#include "gigaset.h"
17#include <linux/ctype.h>
18#include <linux/module.h> 17#include <linux/module.h>
19#include <linux/moduleparam.h> 18#include <linux/moduleparam.h>
20 19
@@ -507,7 +506,7 @@ void gigaset_freecs(struct cardstate *cs)
507 case 2: /* error in initcshw */ 506 case 2: /* error in initcshw */
508 /* Deregister from LL */ 507 /* Deregister from LL */
509 make_invalid(cs, VALID_ID); 508 make_invalid(cs, VALID_ID);
510 gigaset_isdn_unregister(cs); 509 gigaset_isdn_unregdev(cs);
511 510
512 /* fall through */ 511 /* fall through */
513 case 1: /* error when registering to LL */ 512 case 1: /* error when registering to LL */
@@ -769,7 +768,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
769 cs->cmdbytes = 0; 768 cs->cmdbytes = 0;
770 769
771 gig_dbg(DEBUG_INIT, "setting up iif"); 770 gig_dbg(DEBUG_INIT, "setting up iif");
772 if (!gigaset_isdn_register(cs, modulename)) { 771 if (!gigaset_isdn_regdev(cs, modulename)) {
773 pr_err("error registering ISDN device\n"); 772 pr_err("error registering ISDN device\n");
774 goto error; 773 goto error;
775 } 774 }
@@ -1205,11 +1204,13 @@ static int __init gigaset_init_module(void)
1205 gigaset_debuglevel = DEBUG_DEFAULT; 1204 gigaset_debuglevel = DEBUG_DEFAULT;
1206 1205
1207 pr_info(DRIVER_DESC DRIVER_DESC_DEBUG "\n"); 1206 pr_info(DRIVER_DESC DRIVER_DESC_DEBUG "\n");
1207 gigaset_isdn_regdrv();
1208 return 0; 1208 return 0;
1209} 1209}
1210 1210
1211static void __exit gigaset_exit_module(void) 1211static void __exit gigaset_exit_module(void)
1212{ 1212{
1213 gigaset_isdn_unregdrv();
1213} 1214}
1214 1215
1215module_init(gigaset_init_module); 1216module_init(gigaset_init_module);