|
@@ -700,8 +700,8 @@ static void init_r_port(int board, int aiop, int chan, struct pci_dev *pci_dev)
|
|
|
spin_lock_init(&info->slock);
|
|
|
mutex_init(&info->write_mtx);
|
|
|
rp_table[line] = info;
|
|
|
- if (pci_dev)
|
|
|
- tty_register_device(rocket_driver, line, &pci_dev->dev);
|
|
|
+ tty_register_device(rocket_driver, line, pci_dev ? &pci_dev->dev :
|
|
|
+ NULL);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -2438,7 +2438,7 @@ static int __init rp_init(void)
|
|
|
rocket_driver->init_termios.c_ispeed = 9600;
|
|
|
rocket_driver->init_termios.c_ospeed = 9600;
|
|
|
#ifdef ROCKET_SOFT_FLOW
|
|
|
- rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
|
|
|
+ rocket_driver->flags |= TTY_DRIVER_REAL_RAW;
|
|
|
#endif
|
|
|
tty_set_operations(rocket_driver, &rocket_ops);
|
|
|
|
|
@@ -2495,10 +2495,14 @@ static void rp_cleanup_module(void)
|
|
|
if (retval)
|
|
|
printk(KERN_INFO "Error %d while trying to unregister "
|
|
|
"rocketport driver\n", -retval);
|
|
|
- put_tty_driver(rocket_driver);
|
|
|
|
|
|
for (i = 0; i < MAX_RP_PORTS; i++)
|
|
|
- kfree(rp_table[i]);
|
|
|
+ if (rp_table[i]) {
|
|
|
+ tty_unregister_device(rocket_driver, i);
|
|
|
+ kfree(rp_table[i]);
|
|
|
+ }
|
|
|
+
|
|
|
+ put_tty_driver(rocket_driver);
|
|
|
|
|
|
for (i = 0; i < NUM_BOARDS; i++) {
|
|
|
if (rcktpt_io_addr[i] <= 0 || is_PCI[i])
|