|
@@ -324,16 +324,22 @@ static int dtlk_release(struct inode *inode, struct file *file)
|
|
|
|
|
|
static int __init dtlk_init(void)
|
|
|
{
|
|
|
+ int err;
|
|
|
+
|
|
|
dtlk_port_lpc = 0;
|
|
|
dtlk_port_tts = 0;
|
|
|
dtlk_busy = 0;
|
|
|
dtlk_major = register_chrdev(0, "dtlk", &dtlk_fops);
|
|
|
- if (dtlk_major == 0) {
|
|
|
+ if (dtlk_major < 0) {
|
|
|
printk(KERN_ERR "DoubleTalk PC - cannot register device\n");
|
|
|
- return 0;
|
|
|
+ return dtlk_major;
|
|
|
+ }
|
|
|
+ err = dtlk_dev_probe();
|
|
|
+ if (err) {
|
|
|
+ unregister_chrdev(dtlk_major, "dtlk");
|
|
|
+ return err;
|
|
|
}
|
|
|
- if (dtlk_dev_probe() == 0)
|
|
|
- printk(", MAJOR %d\n", dtlk_major);
|
|
|
+ printk(", MAJOR %d\n", dtlk_major);
|
|
|
|
|
|
init_waitqueue_head(&dtlk_process_list);
|
|
|
|