Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67919
b: refs/heads/master
c: f621b84
h: refs/heads/master
i:
  67917: 9b79439
  67915: 9596f4e
  67911: f30e0f8
  67903: 077b110
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Oct 12, 2007
1 parent 55811ee commit db1eb91
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9c563626d9a136636385209d59d0c4f16c4a7ab
refs/heads/master: f621b8437d6ae502dde45797f56407e48c7a68b4
21 changes: 0 additions & 21 deletions trunk/drivers/usb/serial/funsoft.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,6 @@ static struct usb_device_id id_table [] = {
};
MODULE_DEVICE_TABLE(usb, id_table);

static int funsoft_ioctl(struct usb_serial_port *port, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct ktermios t;

dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd);

if (cmd == TCSETSF) {
if (user_termios_to_kernel_termios(&t, (struct termios __user *)arg))
return -EFAULT;

dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__,
t.c_iflag, t.c_oflag, t.c_cflag, t.c_lflag);

if (!(t.c_lflag & ICANON))
return -EINVAL;
}
return -ENOIOCTLCMD;
}

static struct usb_driver funsoft_driver = {
.name = "funsoft",
.probe = usb_serial_probe,
Expand All @@ -63,7 +43,6 @@ static struct usb_serial_driver funsoft_device = {
.num_bulk_in = NUM_DONT_CARE,
.num_bulk_out = NUM_DONT_CARE,
.num_ports = 1,
.ioctl = funsoft_ioctl,
};

static int __init funsoft_init(void)
Expand Down

0 comments on commit db1eb91

Please sign in to comment.