---

yaml
---
r: 287007
b: refs/heads/master
c: d1620ca
h: refs/heads/master
i:
  287005: 6805467
  287003: 5271af4
  286999: c293acc
  286991: df83a83
  286975: 59fd3f2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdc32fd6f7b2b2580d7f1b74563f888e4dd9eb8a
+refs/heads/master: d1620ca9e7bb0030068c3b45b653defde8839dac

trunk/drivers/usb/serial/cp210x.c

@@ -394,10 +394,10 @@ static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
 	else if (baud <= 491520)   baud = 460800;
 	else if (baud <= 567138)   baud = 500000;
 	else if (baud <= 670254)   baud = 576000;
-	else if (baud <= 1053257)  baud = 921600;
-	else if (baud <= 1474560)  baud = 1228800;
-	else if (baud <= 2457600)  baud = 1843200;
-	else                       baud = 3686400;
+	else if (baud < 1000000)
+		baud = 921600;
+	else if (baud > 2000000)
+		baud = 2000000;
 	return baud;
 }
 
@@ -615,7 +615,8 @@ static void cp210x_change_speed(struct tty_struct *tty,
 
 	baud = tty->termios->c_ospeed;
 
-	/* This maps the requested rate to a rate valid on cp2102 or cp2103.
+	/* This maps the requested rate to a rate valid on cp2102 or cp2103,
+	 * or to an arbitrary rate in [1M,2M].
 	 *
 	 * NOTE: B0 is not implemented.
 	 */