diff options
Diffstat (limited to 'drivers/usb/serial/pl2303.c')
-rw-r--r-- | drivers/usb/serial/pl2303.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index 048cd44d51b1..cb6bbed374f2 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -275,7 +275,7 @@ static void pl2303_set_termios(struct tty_struct *tty, | |||
275 | u8 control; | 275 | u8 control; |
276 | const int baud_sup[] = { 75, 150, 300, 600, 1200, 1800, 2400, 3600, | 276 | const int baud_sup[] = { 75, 150, 300, 600, 1200, 1800, 2400, 3600, |
277 | 4800, 7200, 9600, 14400, 19200, 28800, 38400, | 277 | 4800, 7200, 9600, 14400, 19200, 28800, 38400, |
278 | 57600, 115200, 230400, 460800, 614400, | 278 | 57600, 115200, 230400, 460800, 500000, 614400, |
279 | 921600, 1228800, 2457600, 3000000, 6000000 }; | 279 | 921600, 1228800, 2457600, 3000000, 6000000 }; |
280 | int baud_floor, baud_ceil; | 280 | int baud_floor, baud_ceil; |
281 | int k; | 281 | int k; |
@@ -301,8 +301,7 @@ static void pl2303_set_termios(struct tty_struct *tty, | |||
301 | i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), | 301 | i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), |
302 | GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE, | 302 | GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE, |
303 | 0, 0, buf, 7, 100); | 303 | 0, 0, buf, 7, 100); |
304 | dev_dbg(&port->dev, "0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x\n", i, | 304 | dev_dbg(&port->dev, "0xa1:0x21:0:0 %d - %7ph\n", i, buf); |
305 | buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); | ||
306 | 305 | ||
307 | if (cflag & CSIZE) { | 306 | if (cflag & CSIZE) { |
308 | switch (cflag & CSIZE) { | 307 | switch (cflag & CSIZE) { |
@@ -449,8 +448,7 @@ static void pl2303_set_termios(struct tty_struct *tty, | |||
449 | i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), | 448 | i = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), |
450 | GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE, | 449 | GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE, |
451 | 0, 0, buf, 7, 100); | 450 | 0, 0, buf, 7, 100); |
452 | dev_dbg(&port->dev, "0xa1:0x21:0:0 %d - %x %x %x %x %x %x %x\n", i, | 451 | dev_dbg(&port->dev, "0xa1:0x21:0:0 %d - %7ph\n", i, buf); |
453 | buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]); | ||
454 | 452 | ||
455 | if (cflag & CRTSCTS) { | 453 | if (cflag & CRTSCTS) { |
456 | if (spriv->type == HX) | 454 | if (spriv->type == HX) |
@@ -641,8 +639,8 @@ static int pl2303_ioctl(struct tty_struct *tty, | |||
641 | case TIOCGSERIAL: | 639 | case TIOCGSERIAL: |
642 | memset(&ser, 0, sizeof ser); | 640 | memset(&ser, 0, sizeof ser); |
643 | ser.type = PORT_16654; | 641 | ser.type = PORT_16654; |
644 | ser.line = port->serial->minor; | 642 | ser.line = port->minor; |
645 | ser.port = port->number; | 643 | ser.port = port->port_number; |
646 | ser.baud_base = 460800; | 644 | ser.baud_base = 460800; |
647 | 645 | ||
648 | if (copy_to_user((void __user *)arg, &ser, sizeof ser)) | 646 | if (copy_to_user((void __user *)arg, &ser, sizeof ser)) |