diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-26 02:58:40 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-26 02:58:40 +0400 |
| commit | a60387ba3114fe087349df23fa82e5ad9d5b6ff2 (patch) | |
| tree | 4cfdaf4d03da8cff76913b4a4de090e2cd99871a /drivers/usb/serial/ir-usb.c | |
| parent | 0e81bef05e3b90f8319e79bf36e61341f7b6e189 (diff) | |
| parent | d5d1ceac2a47645780bd07fd7a670b14c4d995db (diff) | |
| download | linux-a60387ba3114fe087349df23fa82e5ad9d5b6ff2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (40 commits)
USB: open disconnect race in usblcd
USB: disconnect open race in legousbtower
USB: open disconnect race in iowarrior
USB: missing error check in emi62
USB: missing error check in emi26
USB: usb_serial_resume bug fix
USB: remove new OHCI build warnings
USB: amd5536udc - remove set_mwi() compiler warning
USB: usbserial - fix potential deadlock between write() and IRQ
usb: serial/pl2303: support for IO Data Device RSAQ5
USB: fix read vs. disconnect race in cytherm driver
USB: fix locking in idmouse
USB: fix interface sysfs file-creation bug
USB: fix ssb_ohci_probe() build bug
USB: pl2303: remove can't happen checks, set speed properly and report baud rate
USB: mos7840: Clean up old checks and stuff
USB rio500.c: fix check-after-use
USB iowarrior.c: fix check-after-use
USB: add URB_FREE_BUFFER to permissible flags
USB: isd200: sort out USB/IDE dependancy mess
...
Diffstat (limited to 'drivers/usb/serial/ir-usb.c')
| -rw-r--r-- | drivers/usb/serial/ir-usb.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index 5ab6a0c5ac52..6b803ab98543 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c @@ -504,11 +504,6 @@ static void ir_set_termios (struct usb_serial_port *port, struct ktermios *old_t dbg("%s - port %d", __FUNCTION__, port->number); - if ((!port->tty) || (!port->tty->termios)) { - dbg("%s - no tty structures", __FUNCTION__); - return; - } - baud = tty_get_baud_rate(port->tty); /* @@ -531,8 +526,6 @@ static void ir_set_termios (struct usb_serial_port *port, struct ktermios *old_t default: ir_baud = SPEED_9600; baud = 9600; - /* And once the new tty stuff is all done we need to - call back to correct the baud bits */ } if (xbof == -1) @@ -562,6 +555,10 @@ static void ir_set_termios (struct usb_serial_port *port, struct ktermios *old_t result = usb_submit_urb (port->write_urb, GFP_KERNEL); if (result) dev_err(&port->dev, "%s - failed submitting write urb, error %d\n", __FUNCTION__, result); + + /* Only speed changes are supported */ + tty_termios_copy_hw(port->tty->termios, old_termios); + tty_encode_baud_rate(port->tty, baud, baud); } |