diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /drivers/usb/class/cdc-acm.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 2bfc41ece0e1..85a1a55815cf 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -858,10 +858,7 @@ static void acm_tty_set_termios(struct tty_struct *tty, | |||
| 858 | if (!ACM_READY(acm)) | 858 | if (!ACM_READY(acm)) |
| 859 | return; | 859 | return; |
| 860 | 860 | ||
| 861 | /* FIXME: Needs to support the tty_baud interface */ | 861 | newline.dwDTERate = cpu_to_le32(tty_get_baud_rate(tty)); |
| 862 | /* FIXME: Broken on sparc */ | ||
| 863 | newline.dwDTERate = cpu_to_le32p(acm_tty_speed + | ||
| 864 | (termios->c_cflag & CBAUD & ~CBAUDEX) + (termios->c_cflag & CBAUDEX ? 15 : 0)); | ||
| 865 | newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0; | 862 | newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0; |
| 866 | newline.bParityType = termios->c_cflag & PARENB ? | 863 | newline.bParityType = termios->c_cflag & PARENB ? |
| 867 | (termios->c_cflag & PARODD ? 1 : 2) + | 864 | (termios->c_cflag & PARODD ? 1 : 2) + |