diff options
| author | Andrew Worsley <amworsley@gmail.com> | 2011-11-22 20:00:19 +1100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:43:06 +0200 |
| commit | d62e044103ca7e75bfaa97c562472c33d5b9e408 (patch) | |
| tree | 1536218219bfaf972160e3884b31c0eca4066a30 /drivers | |
| parent | e3c81f656abdbe5ba541a04d60d264046fb6fa22 (diff) | |
USB: serial: ftdi_sio: Handle the old_termios == 0 case e.g. uart_resume_port()
commit c515598e0f5769916c31c00392cc2bfe6af74e55 upstream.
Handle null old_termios in ftdi_set_termios() calls from uart_resume_port().
Signed-off-by: Andrew Worsley <amworsley@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Suggested-by: Lotfi Manseur <lotfi.manseur@imag.fr>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index c374beb342c3..acef3b84623f 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -2364,6 +2364,9 @@ static void ftdi_set_termios(struct tty_struct *tty, cflag = termios->c_cflag; + if (old_termios == 0) + goto no_skip; + if (old_termios->c_cflag == termios->c_cflag && old_termios->c_ispeed == termios->c_ispeed && old_termios->c_ospeed == termios->c_ospeed) @@ -2377,6 +2380,7 @@ static void ftdi_set_termios(struct tty_struct *tty, (termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB))) goto no_data_parity_stop_changes; +no_skip: /* Set number of data bits, parity, stop bits */ termios->c_cflag &= ~CMSPAR; |