1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
diff -pNaru5 trueport-6.10.0.orig/ptyx/ptymod.c trueport-6.10.0/ptyx/ptymod.c
--- trueport-6.10.0.orig/ptyx/ptymod.c 2021-11-20 15:21:35.364409568 -0500
+++ trueport-6.10.0/ptyx/ptymod.c 2021-11-20 15:24:01.845050085 -0500
@@ -284,28 +284,28 @@ static int __init ptyx_init(void)
printk("ptyx module input paramater max_installed_ports=%d is invalid \n", max_installed_ports);
retval = -EINVAL;
goto init_out;
}
- ptyx_master_driver = alloc_tty_driver(max_installed_ports);
- if (!ptyx_master_driver)
+ ptyx_master_driver = tty_alloc_driver(max_installed_ports,0);
+ if (IS_ERR(ptyx_master_driver))
{
printk("Couldn't allocate ptyx master driver \n");
retval = -ENOMEM;
goto init_out;
}
- ptyx_slave_driver = alloc_tty_driver(max_installed_ports);
- if (!ptyx_slave_driver)
+ ptyx_slave_driver = tty_alloc_driver(max_installed_ports,0);
+ if (IS_ERR(ptyx_slave_driver))
{
printk("Couldn't allocate ptyx slave driver \n");
retval = -ENOMEM;
goto init_out;
}
- ptyx_control_driver = alloc_tty_driver(max_installed_ports);
- if (!ptyx_control_driver)
+ ptyx_control_driver = tty_alloc_driver(max_installed_ports,0);
+ if (IS_ERR(ptyx_control_driver))
{
printk("Couldn't allocate ptyx ctrl status driver \n");
retval = -ENOMEM;
goto init_out;
}
@@ -401,24 +401,24 @@ static int __init ptyx_init(void)
ptyx_control_driver->driver_state = pty_state_table; // global pointer ot private data
tty_set_operations(ptyx_control_driver, &ptyx_ops_control);
if ( (retval = tty_register_driver(ptyx_control_driver)) < 0 )
{
- put_tty_driver(ptyx_control_driver);
+ tty_driver_kref_put(ptyx_control_driver);
printk("Couldn't register ptyx control status driver, retval=%d3 \n", retval);
}
if ( (retval = tty_register_driver(ptyx_slave_driver)) < 0 )
{
- put_tty_driver(ptyx_slave_driver);
+ tty_driver_kref_put(ptyx_slave_driver);
printk("Couldn't register ptyx slave driver, retval=%d \n", retval);
goto init_out;
}
if ( (retval = tty_register_driver(ptyx_master_driver)) < 0 )
{
- put_tty_driver(ptyx_slave_driver);
+ tty_driver_kref_put(ptyx_slave_driver);
printk("Couldn't register ptyx master driver, retval=%d \n", retval);
}
init_out:
@@ -430,17 +430,17 @@ static void __exit ptyx_finish(void)
int i;
ptyx_print(PTYX_DEBUG_MISC, ("ptyx_finish(): unregistering driver \n"));
tty_unregister_driver(ptyx_master_driver);
- put_tty_driver(ptyx_master_driver);
+ tty_driver_kref_put(ptyx_master_driver);
tty_unregister_driver(ptyx_slave_driver);
- put_tty_driver(ptyx_slave_driver);
+ tty_driver_kref_put(ptyx_slave_driver);
tty_unregister_driver(ptyx_control_driver);
- put_tty_driver(ptyx_control_driver);
+ tty_driver_kref_put(ptyx_control_driver);
if (pty_state_table)
{
for (i = 0; i < max_installed_ports; i++)
{
|