Skip to content

Commit

Permalink
usb-cypress: There is no 0 case to go with CS5/6/7/8 so remove the test
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Jul 22, 2008
1 parent 813a224 commit 7733682
Showing 1 changed file with 17 additions and 20 deletions.
37 changes: 17 additions & 20 deletions drivers/usb/serial/cypress_m8.c
Original file line number Diff line number Diff line change
Expand Up @@ -1093,27 +1093,24 @@ static void cypress_set_termios(struct tty_struct *tty,
} else
parity_enable = parity_type = 0;

if (cflag & CSIZE) {
switch (cflag & CSIZE) {
case CS5:
data_bits = 0;
break;
case CS6:
data_bits = 1;
break;
case CS7:
data_bits = 2;
break;
case CS8:
data_bits = 3;
break;
default:
err("%s - CSIZE was set, but not CS5-CS8",
__func__);
data_bits = 3;
} else
switch (cflag & CSIZE) {
case CS5:
data_bits = 0;
break;
case CS6:
data_bits = 1;
break;
case CS7:
data_bits = 2;
break;
case CS8:
data_bits = 3;

break;
default:
err("%s - CSIZE was set, but not CS5-CS8",
__func__);
data_bits = 3;
}
spin_lock_irqsave(&priv->lock, flags);
oldlines = priv->line_control;
if ((cflag & CBAUD) == B0) {
Expand Down

0 comments on commit 7733682

Please sign in to comment.