Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185425
b: refs/heads/master
c: 67b9946
h: refs/heads/master
i:
  185423: 24f82b9
v: v3
  • Loading branch information
John Tsiombikas authored and Greg Kroah-Hartman committed Mar 2, 2010
1 parent 7c78e91 commit 244d07e
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac7d4ca9e0b27d7705d273f17afd29828db35ee6
refs/heads/master: 67b9946dd07eeef8188e4cab816d2c370bcaa7b2
13 changes: 13 additions & 0 deletions trunk/drivers/usb/serial/pl2303.c
Original file line number Diff line number Diff line change
Expand Up @@ -895,10 +895,23 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg)
static int pl2303_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct serial_struct ser;
struct usb_serial_port *port = tty->driver_data;
dbg("%s (%d) cmd = 0x%04x", __func__, port->number, cmd);

switch (cmd) {
case TIOCGSERIAL:
memset(&ser, 0, sizeof ser);
ser.type = PORT_16654;
ser.line = port->serial->minor;
ser.port = port->number;
ser.baud_base = 460800;

if (copy_to_user((void __user *)arg, &ser, sizeof ser))
return -EFAULT;

return 0;

case TIOCMIWAIT:
dbg("%s (%d) TIOCMIWAIT", __func__, port->number);
return wait_modem_info(port, arg);
Expand Down

0 comments on commit 244d07e

Please sign in to comment.