aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_io.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 08:51:50 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 14:30:21 -0500
commit1a54a76d5171f3ffd89eb69f6f38d535724e3d05 (patch)
tree6d6491bdddb6356dd08813299f1af49c1b1ddc5f /drivers/tty/tty_io.c
parenta8fbc974c347a798fd0c6f0bffe7bf46b8c6dfb6 (diff)
TTY: let alloc_tty_driver deduce the owner automatically
Like the rest of the kernel, make a stub from alloc_tty_driver which calls __alloc_tty_driver with proper owner. This will save us one more assignment on the driver side. Also this fixes some drivers which didn't set the owner. This allowed user to remove the module from the system even though a tty from the driver is still open. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r--drivers/tty/tty_io.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index f105ce5c8e6e..bd95cea3173b 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -3049,7 +3049,7 @@ void tty_unregister_device(struct tty_driver *driver, unsigned index)
3049} 3049}
3050EXPORT_SYMBOL(tty_unregister_device); 3050EXPORT_SYMBOL(tty_unregister_device);
3051 3051
3052struct tty_driver *alloc_tty_driver(int lines) 3052struct tty_driver *__alloc_tty_driver(int lines, struct module *owner)
3053{ 3053{
3054 struct tty_driver *driver; 3054 struct tty_driver *driver;
3055 3055
@@ -3058,11 +3058,12 @@ struct tty_driver *alloc_tty_driver(int lines)
3058 kref_init(&driver->kref); 3058 kref_init(&driver->kref);
3059 driver->magic = TTY_DRIVER_MAGIC; 3059 driver->magic = TTY_DRIVER_MAGIC;
3060 driver->num = lines; 3060 driver->num = lines;
3061 driver->owner = owner;
3061 /* later we'll move allocation of tables here */ 3062 /* later we'll move allocation of tables here */
3062 } 3063 }
3063 return driver; 3064 return driver;
3064} 3065}
3065EXPORT_SYMBOL(alloc_tty_driver); 3066EXPORT_SYMBOL(__alloc_tty_driver);
3066 3067
3067static void destruct_tty_driver(struct kref *kref) 3068static void destruct_tty_driver(struct kref *kref)
3068{ 3069{