diff options
author | Alan Cox <alan@linux.intel.com> | 2009-09-19 16:13:33 -0400 |
---|---|---|
committer | Live-CD User <linux@linux.site> | 2009-09-19 16:13:33 -0400 |
commit | fe1ae7fdd2ee603f2d95f04e09a68f7f79045127 (patch) | |
tree | 1234647e3bd970cfb105dab1c4f0ad2cd14ce179 /drivers/usb/serial/whiteheat.c | |
parent | ba15ab0e8de0d4439a91342ad52d55ca9e313f3d (diff) |
tty: USB serial termios bits
Various drivers have hacks to mangle termios structures. This stems from
the fact there is no nice setup hook for configuring the termios settings
when the port is created
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/whiteheat.c')
-rw-r--r-- | drivers/usb/serial/whiteheat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 81f2ae505966..62424eec33ec 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
@@ -259,7 +259,7 @@ static int firm_send_command(struct usb_serial_port *port, __u8 command, | |||
259 | __u8 *data, __u8 datasize); | 259 | __u8 *data, __u8 datasize); |
260 | static int firm_open(struct usb_serial_port *port); | 260 | static int firm_open(struct usb_serial_port *port); |
261 | static int firm_close(struct usb_serial_port *port); | 261 | static int firm_close(struct usb_serial_port *port); |
262 | static int firm_setup_port(struct tty_struct *tty); | 262 | static void firm_setup_port(struct tty_struct *tty); |
263 | static int firm_set_rts(struct usb_serial_port *port, __u8 onoff); | 263 | static int firm_set_rts(struct usb_serial_port *port, __u8 onoff); |
264 | static int firm_set_dtr(struct usb_serial_port *port, __u8 onoff); | 264 | static int firm_set_dtr(struct usb_serial_port *port, __u8 onoff); |
265 | static int firm_set_break(struct usb_serial_port *port, __u8 onoff); | 265 | static int firm_set_break(struct usb_serial_port *port, __u8 onoff); |
@@ -1210,7 +1210,7 @@ static int firm_close(struct usb_serial_port *port) | |||
1210 | } | 1210 | } |
1211 | 1211 | ||
1212 | 1212 | ||
1213 | static int firm_setup_port(struct tty_struct *tty) | 1213 | static void firm_setup_port(struct tty_struct *tty) |
1214 | { | 1214 | { |
1215 | struct usb_serial_port *port = tty->driver_data; | 1215 | struct usb_serial_port *port = tty->driver_data; |
1216 | struct whiteheat_port_settings port_settings; | 1216 | struct whiteheat_port_settings port_settings; |
@@ -1285,7 +1285,7 @@ static int firm_setup_port(struct tty_struct *tty) | |||
1285 | port_settings.lloop = 0; | 1285 | port_settings.lloop = 0; |
1286 | 1286 | ||
1287 | /* now send the message to the device */ | 1287 | /* now send the message to the device */ |
1288 | return firm_send_command(port, WHITEHEAT_SETUP_PORT, | 1288 | firm_send_command(port, WHITEHEAT_SETUP_PORT, |
1289 | (__u8 *)&port_settings, sizeof(port_settings)); | 1289 | (__u8 *)&port_settings, sizeof(port_settings)); |
1290 | } | 1290 | } |
1291 | 1291 | ||