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/ipw.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/ipw.c')
| -rw-r--r-- | drivers/usb/serial/ipw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c index 29ad038b9c8d..727d323f092a 100644 --- a/drivers/usb/serial/ipw.c +++ b/drivers/usb/serial/ipw.c | |||
| @@ -193,8 +193,7 @@ static void ipw_read_bulk_callback(struct urb *urb) | |||
| 193 | return; | 193 | return; |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | static int ipw_open(struct tty_struct *tty, | 196 | static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port) |
| 197 | struct usb_serial_port *port, struct file *filp) | ||
| 198 | { | 197 | { |
| 199 | struct usb_device *dev = port->serial->dev; | 198 | struct usb_device *dev = port->serial->dev; |
| 200 | u8 buf_flow_static[16] = IPW_BYTES_FLOWINIT; | 199 | u8 buf_flow_static[16] = IPW_BYTES_FLOWINIT; |