From: Alan Cox <alan@redhat.com>
Date: Tue, 22 Jul 2008 10:10:53 +0000 (+0100)
Subject: usb-cypress: There is no 0 case to go with CS5/6/7/8 so remove the test
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=77336828c01933d37102c4bef6e2a2cf7e3243b3;p=openwrt%2Fstaging%2Fblogic.git

usb-cypress: There is no 0 case to go with CS5/6/7/8 so remove the test

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>
---

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index bb9c7c45e98f..22837a3f2f89 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -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) {