Skip to content

Commit 68fbe26

Browse files
jhovoldgregkh
authored andcommitted
USB: serial: f81232: fix division by zero on line-speed change
commit a08ca6e upstream. The driver leaves the line speed unchanged in case a requested speed is not supported. Make sure to handle the case where the current speed is B0 (hangup) without dividing by zero when determining the clock source. Fixes: 268ddb5 ("USB: serial: f81232: add high baud rate support") Cc: stable@vger.kernel.org # 5.2 Cc: Ji-Ze Hong (Peter Hong) <hpeter@gmail.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3ec7f24 commit 68fbe26

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/usb/serial/f81232.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@ static u8 const clock_table[] = { F81232_CLK_1_846_MHZ, F81232_CLK_14_77_MHZ,
130130

131131
static int calc_baud_divisor(speed_t baudrate, speed_t clockrate)
132132
{
133-
if (!baudrate)
134-
return 0;
135-
136133
return DIV_ROUND_CLOSEST(clockrate, baudrate);
137134
}
138135

@@ -519,9 +516,14 @@ static void f81232_set_baudrate(struct tty_struct *tty,
519516
speed_t baud_list[] = { baudrate, old_baudrate, F81232_DEF_BAUDRATE };
520517

521518
for (i = 0; i < ARRAY_SIZE(baud_list); ++i) {
522-
idx = f81232_find_clk(baud_list[i]);
519+
baudrate = baud_list[i];
520+
if (baudrate == 0) {
521+
tty_encode_baud_rate(tty, 0, 0);
522+
return;
523+
}
524+
525+
idx = f81232_find_clk(baudrate);
523526
if (idx >= 0) {
524-
baudrate = baud_list[i];
525527
tty_encode_baud_rate(tty, baudrate, baudrate);
526528
break;
527529
}

0 commit comments

Comments
 (0)