 diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
 index 3835106..dcba930 100644
 --- a/drivers/usb/serial/cp210x.c
 +++ b/drivers/usb/serial/cp210x.c
 @@ -201,6 +201,8 @@ static struct usb_serial_driver cp210x_device = {
 #define CP210X_EMBED_EVENTS 0x15
 #define CP210X_GET_EVENTSTATE 0x16
 #define CP210X_SET_CHARS 0x19
 +#define CP210X_GET_BAUDRATE 0x1d
 +#define CP210X_SET_BAUDRATE 0x1e
 
 /* CP210X_IFC_ENABLE */
 #define UART_ENABLE  0x0001
 @@ -459,16 +461,12 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
  unsigned int *cflagp, unsigned int *baudp)
 {
  unsigned int cflag, modem_ctl[4];
 - unsigned int baud;
 + u32 baud;
  unsigned int bits;
 
  dbg("%s - port %d", __func__, port->number);
 
 - cp210x_get_config(port, CP210X_GET_BAUDDIV, &baud, 2);
 - /* Convert to baudrate */
 - if (baud)
 -  baud = cp210x_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud);
 -
 + cp210x_get_config(port, CP210X_GET_BAUDRATE, &baud, sizeof(baud));
  dbg("%s - baud rate = %d", __func__, baud);
  *baudp = baud;
 
 @@ -580,7 +578,8 @@ static void cp210x_set_termios(struct tty_struct *tty,
   struct usb_serial_port *port, struct ktermios *old_termios)
 {
  unsigned int cflag, old_cflag;
 - unsigned int baud = 0, bits;
 + u32 baud;
 + unsigned int bits;
  unsigned int modem_ctl[4];
 
  dbg("%s - port %d", __func__, port->number);
 @@ -595,8 +594,8 @@ static void cp210x_set_termios(struct tty_struct *tty,
  /* If the baud rate is to be updated*/
  if (baud != tty_termios_baud_rate(old_termios) && baud != 0) {
   dbg("%s - Setting baud rate to %d baud", __func__, baud);
 -  if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV,
 -     ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) {
 +  if (cp210x_set_config(port, CP210X_SET_BAUDRATE,
 +       &baud, sizeof(baud))) {
    dbg("Baud rate requested not supported by device");
    baud = tty_termios_baud_rate(old_termios);
   }
 -- 
 def serialList(forAutoDetect=False):
 	"""
 		Retrieve a list of serial ports found in the system.
 	:param forAutoDetect: if true then only the USB serial ports are listed. Else all ports are listed.
 	:return: A list of strings where each string is a serial port.
 	"""
 	baselist=[]
 	if platform.system() == "Windows":
 		try:
 			key=_winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,"HARDWARE\\DEVICEMAP\\SERIALCOMM")
 			i=0
 			while True:
 				values = _winreg.EnumValue(key, i)
 				if not forAutoDetect or ('USBSER' in values[0]) or ('Silabser' in values[0]):
 					baselist+=[values[1]]
 				i+=1
 		except:
 			pass
 	if forAutoDetect:
 		baselist = baselist + glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') + glob.glob("/dev/cu.usb*") + glob.glob("/dev/tty.SLAB*")
 		baselist = filter(lambda s: not 'Bluetooth' in s, baselist)
 		prev = profile.getMachineSetting('serial_port_auto')
 		if prev in baselist:
 			baselist.remove(prev)
 			baselist.insert(0, prev)
 	else:
 		baselist = baselist + glob.glob('/dev/ttyUSB*') + glob.glob('/dev/ttyACM*') + glob.glob("/dev/cu.*") + glob.glob("/dev/tty.usb*") + glob.glob("/dev/rfcomm*") + glob.glob('/dev/serial/by-id/*')
 	if version.isDevVersion() and not forAutoDetect:
 		baselist.append('VIRTUAL')
 	return baselist