Revert "usb: pl2303: also use the divisor based baud rate encoding method for baud...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Nov 2013 16:18:38 +0000 (09:18 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Nov 2013 16:18:38 +0000 (09:18 -0700)
This reverts commit 61fa8d694b8547894b57ea0d99d0120a58f6ebf8.

Revert all of the pl2303 changes that went into 3.12-rc1 and -rc2 as
they cause regressions on some versions of the chip.  This will all be
revisited for later kernel versions when we can figure out how to handle
this in a way that does not break working devices.

Reported-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/pl2303.c

index 09fb55cf3be7171fc96edf826f4bd9ecc81b20c4..61c9f9d28ee9e77d67340736f51acde28302fe07 100644 (file)
@@ -395,7 +395,7 @@ static void pl2303_encode_baudrate(struct tty_struct *tty,
         * 2) Divisor based method: encodes a divisor to a base value (12MHz*32)
         *    => supported by HX chips (and likely not by type_0/1 chips)
         */
-       if (type != HX)
+       if (type != HX || baud <= 115200)
                baud = pl2303_baudrate_encode_direct(baud, type, buf);
        else
                baud = pl2303_baudrate_encode_divisor(baud, type, buf);