public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

char: lp: detach the device when parallel port is removed

Browse source 
When the parallel port is usb based and the lp attaches to it, we do
get /dev/lp0, but when we remove the usb device and the parallel port
is gone, we are still left with /dev/lp0.
Unregister the device properly in the detach routine based on the port
number it has connected to.

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee 2018-12-07 14:27:31 +00:00 • committed by Greg Kroah-Hartman
parent 0edf39d2c7
commit d6318c0e83
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/char/lp.c
View file

@ -976,6 +976,8 @@ static void lp_attach(struct parport *port)
static void lp_detach(struct parport *port) static void lp_detach(struct parport *port)
{ {
int n;
/* Write this some day. */ /* Write this some day. */
#ifdef CONFIG_LP_CONSOLE #ifdef CONFIG_LP_CONSOLE
if (console_registered == port) { if (console_registered == port) {
@ -983,6 +985,14 @@ static void lp_detach(struct parport *port)
console_registered = NULL; console_registered = NULL;
} }
#endif /* CONFIG_LP_CONSOLE */ #endif /* CONFIG_LP_CONSOLE */
for (n = 0; n < LP_NO; n++) {
if (port_num[n] == port->number) {
port_num[n] = -1;
device_destroy(lp_class, MKDEV(LP_MAJOR, n));
parport_unregister_device(lp_table[n].dev);
}
}
} }
static struct parport_driver lp_driver = { static struct parport_driver lp_driver = {
@ -1082,8 +1092,6 @@ static int __init lp_init_module(void)
static void lp_cleanup_module(void) static void lp_cleanup_module(void)
{ {
unsigned int offset;
parport_unregister_driver(&lp_driver); parport_unregister_driver(&lp_driver);
#ifdef CONFIG_LP_CONSOLE #ifdef CONFIG_LP_CONSOLE
@ -1091,13 +1099,6 @@ static void lp_cleanup_module(void)
#endif #endif
unregister_chrdev(LP_MAJOR, "lp"); unregister_chrdev(LP_MAJOR, "lp");
for (offset = 0; offset < LP_NO; offset++) {
if (lp_table[offset].dev == NULL)
continue;
port_num[offset] = -1;
parport_unregister_device(lp_table[offset].dev);
device_destroy(lp_class, MKDEV(LP_MAJOR, offset));
}
class_destroy(lp_class); class_destroy(lp_class);
} }