lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Char: rocket, fix dynamic_dev tty

Browse Source 
- register_device unconditionally (non-pci dependent) to have also isa
  devices in /dev
- unregister devices on module removal
- don't set TTY_DRIVER_DYNAMIC_DEV twice (removed the one dependent on some
  macro)

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Ferenc Wagner <wferi@niif.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby
2007-10-18 03:06:26 -07:00
committed by Linus Torvalds
parent 8cf5a8c572
commit ac6aec2f56
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/char/rocket.c
View File

@@ -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); spin_lock_init(&info->slock);
mutex_init(&info->write_mtx); mutex_init(&info->write_mtx);
rp_table[line] = info; rp_table[line] = info;
if (pci_dev) tty_register_device(rocket_driver, line, pci_dev ? &pci_dev->dev :
tty_register_device(rocket_driver, line, &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_ispeed = 9600;
rocket_driver->init_termios.c_ospeed = 9600; rocket_driver->init_termios.c_ospeed = 9600;
#ifdef ROCKET_SOFT_FLOW #ifdef ROCKET_SOFT_FLOW
rocket_driver->flags |= TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; rocket_driver->flags |= TTY_DRIVER_REAL_RAW;
#endif #endif
tty_set_operations(rocket_driver, &rocket_ops); tty_set_operations(rocket_driver, &rocket_ops);
@@ -2495,10 +2495,14 @@ static void rp_cleanup_module(void)
if (retval) if (retval)
printk(KERN_INFO "Error %d while trying to unregister " printk(KERN_INFO "Error %d while trying to unregister "
"rocketport driver\n", -retval); "rocketport driver\n", -retval);
put_tty_driver(rocket_driver);
for (i = 0; i < MAX_RP_PORTS; i++) 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++) { for (i = 0; i < NUM_BOARDS; i++) {
if (rcktpt_io_addr[i] <= 0 || is_PCI[i]) if (rcktpt_io_addr[i] <= 0 || is_PCI[i])