diff options
| author | Andrew Worsley <amworsley@gmail.com> | 2011-11-22 20:00:19 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-13 09:25:11 -0700 |
| commit | 9c9d7bf530c4d01e695fd9e8ba69006177d36a14 (patch) | |
| tree | ee8424844cc81a12d9edc772f91875d4e86d85cb /drivers/usb/serial | |
| parent | c4c2a7db886d6a7bb562fe5eebbb74ba043745b2 (diff) | |
| download | kernel_samsung_smdk4412-9c9d7bf530c4d01e695fd9e8ba69006177d36a14.tar.gz kernel_samsung_smdk4412-9c9d7bf530c4d01e695fd9e8ba69006177d36a14.tar.bz2 kernel_samsung_smdk4412-9c9d7bf530c4d01e695fd9e8ba69006177d36a14.zip | |
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>
Cc: Lotfi Manseur <lotfi.manseur@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -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 7639cba7909..457122a5a96 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -2141,6 +2141,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) @@ -2154,6 +2157,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 */ urb_value = 0; |