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/opticon.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/opticon.c')
| -rw-r--r-- | drivers/usb/serial/opticon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 336bba79ad32..1085a577c5c1 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
| @@ -144,8 +144,7 @@ exit: | |||
| 144 | spin_unlock(&priv->lock); | 144 | spin_unlock(&priv->lock); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | static int opticon_open(struct tty_struct *tty, struct usb_serial_port *port, | 147 | static int opticon_open(struct tty_struct *tty, struct usb_serial_port *port) |
| 148 | struct file *filp) | ||
| 149 | { | 148 | { |
| 150 | struct opticon_private *priv = usb_get_serial_data(port->serial); | 149 | struct opticon_private *priv = usb_get_serial_data(port->serial); |
| 151 | unsigned long flags; | 150 | unsigned long flags; |