diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-21 06:51:42 -0400 |
| commit | ae82bfd61ca7e57cc2d914add9ab0873e260f2f5 (patch) | |
| tree | a7f862ad8b0ae4f2e8953e6aa613eb702b484ecf /drivers/usb/serial/io_ti.c | |
| parent | cd74c86bdf705f824d494a2bbda393d1d562b40a (diff) | |
| parent | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (diff) | |
Merge branch 'linus' into perfcounters/rename
Merge reason: pull in all the latest code before doing the rename.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/io_ti.c')
| -rw-r--r-- | drivers/usb/serial/io_ti.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index e8bc42f92e79..d4cc0f7af400 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
| @@ -1831,8 +1831,7 @@ static void edge_bulk_out_callback(struct urb *urb) | |||
| 1831 | tty_kref_put(tty); | 1831 | tty_kref_put(tty); |
| 1832 | } | 1832 | } |
| 1833 | 1833 | ||
| 1834 | static int edge_open(struct tty_struct *tty, | 1834 | static int edge_open(struct tty_struct *tty, struct usb_serial_port *port) |
| 1835 | struct usb_serial_port *port, struct file *filp) | ||
| 1836 | { | 1835 | { |
| 1837 | struct edgeport_port *edge_port = usb_get_serial_port_data(port); | 1836 | struct edgeport_port *edge_port = usb_get_serial_port_data(port); |
| 1838 | struct edgeport_serial *edge_serial; | 1837 | struct edgeport_serial *edge_serial; |