diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-08-07 15:47:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-13 19:50:19 -0400 |
| commit | 734cc1783816ae358cef45673a29bf7af974e147 (patch) | |
| tree | 146fde2a1add56ff7a35915d0fd1db7e01ce6630 /drivers/usb/class/cdc-acm.c | |
| parent | 7e73eca6a7b2967423902a4543821bb97cbbe698 (diff) | |
TTY: use tty_port_register_device
Currently we have no way to assign tty->port while performing tty
installation. There are two ways to provide the link tty_struct =>
tty_port. Either by calling tty_port_install from tty->ops->install or
tty_port_register_device called instead of tty_register_device when
the device is being set up after connected.
In this patch we modify most of the drivers to do the latter. When the
drivers use tty_register_device and we have tty_port already, we
switch to tty_port_register_device. So we have the tty_struct =>
tty_port link for free for those.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 18f4e62aaa75..455ef1649231 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1298,7 +1298,8 @@ skip_countries: | |||
| 1298 | usb_set_intfdata(data_interface, acm); | 1298 | usb_set_intfdata(data_interface, acm); |
| 1299 | 1299 | ||
| 1300 | usb_get_intf(control_interface); | 1300 | usb_get_intf(control_interface); |
| 1301 | tty_register_device(acm_tty_driver, minor, &control_interface->dev); | 1301 | tty_port_register_device(&acm->port, acm_tty_driver, minor, |
| 1302 | &control_interface->dev); | ||
| 1302 | 1303 | ||
| 1303 | return 0; | 1304 | return 0; |
| 1304 | alloc_fail7: | 1305 | alloc_fail7: |