diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-01 12:19:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-01 12:19:24 -0400 |
commit | 336b9daf90d2a1575088ab93d7bfe82dcd10dd8d (patch) | |
tree | 3483dd1064d8af6a9c763e32a5ccd49881a85d42 /drivers/usb/serial/pl2303.c | |
parent | 692ed4ddf0010dd643d38d6ef1a15bf64a7fbc6d (diff) |
Revert "usb: pl2303: remove 500000 baud from the list of standard baud rates"
This reverts commit b9208c721ce736125fe58d398319513a27850fd8.
Revert all of the pl2303 changes that went into 3.12-rc1 and -rc2 as
they cause regressions on some versions of the chip. This will all be
revisited for later kernel versions when we can figure out how to handle
this in a way that does not break working devices.
Reported-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Frank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/pl2303.c')
-rw-r--r-- | drivers/usb/serial/pl2303.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index a0ea92ed35c6..04390dff926a 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -291,8 +291,8 @@ static void pl2303_encode_baudrate(struct tty_struct *tty, | |||
291 | const int baud_sup[] = { 75, 150, 300, 600, 1200, 1800, 2400, | 291 | const int baud_sup[] = { 75, 150, 300, 600, 1200, 1800, 2400, |
292 | 3600, 4800, 7200, 9600, 14400, 19200, | 292 | 3600, 4800, 7200, 9600, 14400, 19200, |
293 | 28800, 38400, 57600, 115200, 230400, | 293 | 28800, 38400, 57600, 115200, 230400, |
294 | 460800, 614400, 921600, 1228800, | 294 | 460800, 500000, 614400, 921600, |
295 | 2457600, 3000000, 6000000 }; | 295 | 1228800, 2457600, 3000000, 6000000 }; |
296 | int i; | 296 | int i; |
297 | 297 | ||
298 | /* Set baudrate to nearest supported value */ | 298 | /* Set baudrate to nearest supported value */ |