Author: joerg
Date: Fri Aug 8 14:48:26 2014
New Revision: 269718
URL: http://svnweb.freebsd.org/changeset/base/269718
Log:
Merge r269470:
Avoid a divide-by-zero panic when setting the baudrate to 0.
Modified:
stable/10/sys/dev/usb/serial/umcs.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/usb/serial/umcs.c
==============================================================================
--- stable/10/sys/dev/usb/serial/umcs.c Fri Aug 8 14:42:03 2014
(r269717)
+++ stable/10/sys/dev/usb/serial/umcs.c Fri Aug 8 14:48:26 2014
(r269718)
@@ -1083,7 +1083,10 @@ umcs7840_calc_baudrate(uint32_t rate, ui
for (i = 0; i < umcs7840_baudrate_divisors_len - 1 &&
!(rate > umcs7840_baudrate_divisors[i] && rate <=
umcs7840_baudrate_divisors[i + 1]); ++i);
- *divisor = umcs7840_baudrate_divisors[i + 1] / rate;
+ if (rate == 0)
+ *divisor = 1; /* XXX */
+ else
+ *divisor = umcs7840_baudrate_divisors[i + 1] / rate;
/* 0x00 .. 0x70 */
*clk = i << MCS7840_DEV_SPx_CLOCK_SHIFT;
return (0);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
