Commit 871996ed authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: pl2303: enforce baud-rate limits before lookup

Enforce any baud-rate limits before doing table lookup.
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 59afe10e
...@@ -351,6 +351,9 @@ static void pl2303_encode_baud_rate(struct tty_struct *tty, ...@@ -351,6 +351,9 @@ static void pl2303_encode_baud_rate(struct tty_struct *tty,
dev_dbg(&port->dev, "baud requested = %u\n", baud); dev_dbg(&port->dev, "baud requested = %u\n", baud);
if (!baud) if (!baud)
return; return;
if (spriv->type->max_baud_rate)
baud = min_t(speed_t, baud, spriv->type->max_baud_rate);
/* /*
* Set baud rate to nearest supported value. * Set baud rate to nearest supported value.
* *
...@@ -359,9 +362,6 @@ static void pl2303_encode_baud_rate(struct tty_struct *tty, ...@@ -359,9 +362,6 @@ static void pl2303_encode_baud_rate(struct tty_struct *tty,
*/ */
baud = pl2303_get_supported_baud_rate(baud); baud = pl2303_get_supported_baud_rate(baud);
if (spriv->type->max_baud_rate)
baud = min_t(speed_t, baud, spriv->type->max_baud_rate);
if (baud <= 115200) { if (baud <= 115200) {
put_unaligned_le32(baud, buf); put_unaligned_le32(baud, buf);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment