From 7e32b8a0785e9b2a24646ff1e546724a1fd546b6 Mon Sep 17 00:00:00 2001 From: Andrew Worsley Date: Tue, 22 Nov 2011 20:00:19 +1100 Subject: [PATCH] --- yaml --- r: 280781 b: refs/heads/master c: c515598e0f5769916c31c00392cc2bfe6af74e55 h: refs/heads/master i: 280779: c1dd406833a4c59d28810ead7fa577d311fb4579 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3d6ad4dc43ef..cd44eedc0fc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 045ddc8991698a8e9c5668c6190faa8b5d516dc0 +refs/heads/master: c515598e0f5769916c31c00392cc2bfe6af74e55 diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index bd4298bb6750..13e4ecc6e43d 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -2104,6 +2104,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) @@ -2117,6 +2120,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;