Merge branch 'for-2.6.27' of git://git.marvell.com/mv643xx_eth into upstream-fixes

[mv-sheeva.git] / drivers / usb / serial / cypress_m8.c

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index bb9c7c45e98f5951234507da259dc34a909186f5..22837a3f2f899e963f0d944814d222bcd2e494f5 100644 (file)
--- 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) {